tree c8c1daf6700939366890d7da8710e9bd0e461721
parent 58eaa13f18cfa17c7f2073dc8ee022e98af091c4
parent a8387db55eb0f92686d0f2bd1bda2ce7a7d5f6a7
author Steve McKay <smckay@google.com> 1468627973 +0000
committer android-build-merger <android-build-merger@google.com> 1468627973 +0000

Merge \\"Include an app icon.\\" into nyc-mr1-dev am: 3d8c9981b5
am: a8387db55e

Change-Id: Ibe38576f5bada20131d05e550d93f6b6be54179f