Bug: 17537869
Change-Id: Ibfc1c84aff72aeb76c9b127503369d00f3dfaceb

* commit 'cf5fc1ea':
  Fix drawing of custom action label key

* commit '4e1f1689':
  Fix drawing of custom action label key

* commit '5ae05786':
  Fix drawing of custom action label key

Change-Id: I9547b6c0f082ef7c09b251a6458badb65a841229

[1/2]

Bug: 17464068
Change-Id: Ie45191c74a97c44711dc0c6d65cc262fd9742abe

am 1f76ef0e: (-s ours) am 6e0e130e: (-s ours) am 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '1f76ef0e':
  Import translations. DO NOT MERGE

am 12e57c5a: (-s ours) am b8ca040c: (-s ours) am b979cd54: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '12e57c5a':
  Import translations. DO NOT MERGE

am 891f997c: (-s ours) am f5cec932: (-s ours) am aaddee70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '891f997c':
  Import translations. DO NOT MERGE

am fb6e234c: (-s ours) am adf64196: (-s ours) am 771a3a7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'fb6e234c':
  Import translations. DO NOT MERGE

am 1bddfbba: (-s ours) am 923950d1: (-s ours) am d5937725: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '1bddfbba':
  Import translations. DO NOT MERGE

am ee63d2f1: (-s ours) am 8e3f5ce1: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'ee63d2f1':
  Import translations. DO NOT MERGE

am 4fff69df: (-s ours) am b1cdeef0: (-s ours) am 9dafca38: (-s ours) Import translations. DO NOT MERGE

* commit '4fff69df':
  Import translations. DO NOT MERGE

am 6e0e130e: (-s ours) am 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '6e0e130e':
  Import translations. DO NOT MERGE

am b8ca040c: (-s ours) am b979cd54: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'b8ca040c':
  Import translations. DO NOT MERGE

am f5cec932: (-s ours) am aaddee70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'f5cec932':
  Import translations. DO NOT MERGE

am adf64196: (-s ours) am 771a3a7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'adf64196':
  Import translations. DO NOT MERGE

am 923950d1: (-s ours) am d5937725: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '923950d1':
  Import translations. DO NOT MERGE

am 8e3f5ce1: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '8e3f5ce1':
  Import translations. DO NOT MERGE

* commit 'b1cdeef0':
  Import translations. DO NOT MERGE

* commit '81c1daa9':
  Import translations. DO NOT MERGE

* commit 'b979cd54':
  Import translations. DO NOT MERGE

* commit 'aaddee70':
  Import translations. DO NOT MERGE

* commit '771a3a7d':
  Import translations. DO NOT MERGE

* commit 'd5937725':
  Import translations. DO NOT MERGE

* commit '73cbb981':
  Import translations. DO NOT MERGE

* commit '9dafca38':
  Import translations. DO NOT MERGE