Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit 'dfe0c29383049b269094a51fd74e693a8cb9b5b0':
  Add entries for string resources that appear in clings
am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit '80d64c28f45e0378e05021dc9222982b3d67150e':
  Add entries for string resources that appear in clings
am 74c697c7: am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit '74c697c7102c66c37f1588201750236234f20b12':
  Add entries for string resources that appear in clings
Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev
am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit '0d06152d4026e933d8308002e1d53ca4eba6cad2':
  Remove unnecessary allocations during draw Bug #7327799
merge in jb-mr1-release history after reset to jb-mr1-dev
am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit 'cc69ee77b0a96baa75499c1a116d8cbbfce7422f':
  Remove unnecessary allocations during draw Bug #7327799
am 4d36be5a: am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit '4d36be5ac4f128531865d706359ec10f7ab5996a':
  Remove unnecessary allocations during draw Bug #7327799
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: If20e289cd34c19f80f7c2ad19587d19483a7700f
am f5fb2a06: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f5fb2a0656d21a2bcc1dd419d3bbf3dc8f11c181':
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Let's enhance

Add mipmap-* launcher icon assets. Removes equivalent icons from
drawable directories and fixes up the reference to them in a layout.

Bug: 6718166
Change-Id: Ic97e3208d0b47523c8fabef949b2b06825e2fa8f
am 0c2388a4: Let\'s enhance

* commit '0c2388a40c3435615afa1e9b424549d29a98f44e':
  Let's enhance
am dddd6c31: am 0c2388a4: Let\'s enhance

* commit 'dddd6c3117c7e6a6af0dd6542c0e6225eb7e274d':
  Let's enhance
am d294cac5: am dddd6c31: am 0c2388a4: Let\'s enhance

* commit 'd294cac5d83eb18dea9b2f84d4202b13f3ea3c43':
  Let's enhance
merge in jb-mr1-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I204c53690f99803900e6613188a6d9a14370e007
am 2ee4be8d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae':
merge in jb-mr1-factory-release history after reset to jb-mr1-dev