am 37b2bac3: am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit '37b2bac33e90411f2bfd0ee1117b595dcc2b50d5':
  Update custom cling params
am 8dcd596e: am 37b2bac3: am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit '8dcd596e763b70740e6bdd3cac31fedc90cb8c8a':
  Update custom cling params
Remove unnecessary allocations during draw
Bug #7327799

Change-Id: Ic3a18fb9d850f2c692dcb187a206c61dfa8108a4
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Merge "Import translations. DO NOT MERGE"
am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'a7b294057a5ec8f72e8f261ab00960565e4efd3b':
  Import translations. DO NOT MERGE
am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f8a49f869d6d0303998e8483ca7f650a0d4e5963':
  Import translations. DO NOT MERGE
am a2e9f101: (-s ours) am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'a2e9f101bd2369d4d344d04c317882d1ef90058c':
  Import translations. DO NOT MERGE
am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'db983fa7c46da75469d0042425b41f84b5cdc9ac':
  Import translations. DO NOT MERGE
am 9870efdd: (-s ours) am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '9870efdd359eef447709a92fef474afc04aba24a':
  Import translations. DO NOT MERGE
Revert "Import translations. DO NOT MERGE"

broken build

This reverts commit 83e8b468847b92ad11dead50d0c35f47b4b593e9

Change-Id: I42878c0de6156d23aa73fbf36ab699542b387c20
Merge "Revert "Import translations. DO NOT MERGE""
Revert "Import translations. DO NOT MERGE"

broken build

This reverts commit 2826bc4fb6ec196eb72be7b9ef569996e2ff0dd4

Change-Id: I232f8abdf1fdb592ba76216fc82d836294ca4e09
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Revert "Import translations. DO NOT MERGE"

broken build

This reverts commit 4caeee6e08317abaf70b52e1a8b6b8a9e6300a7f

Change-Id: Ie3456538cf40d34ca9d1121cc523f968f2c3a9e2
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '260eb9c6ff598d792b51e5c24608602a1f5b1504':
  Revert "Import translations. DO NOT MERGE"
am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

* commit 'ae5a2a4a4ef055fc0403b2cefa860b29ae88c998':
  Revert "Import translations. DO NOT MERGE"
am 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '61854931252710cedbb596918dee6524723d1223':
  Revert "Import translations. DO NOT MERGE"