From: Ari Sachter-Zeltzer <asz@google.com>
Date: Wed, 16 Oct 2013 22:16:20 +0000 (-0700)
Subject: am 7015ae63: am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~23^2~66
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=839cac61b1765e7bc53b106c851e7fdeaf57a0dd;p=android-x86%2Fpackages-apps-Camera2.git

am 7015ae63: am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad

* commit '7015ae63cfad8305f85c3b55bfa0c12acb18020e':
  update camera launcher icon
---

839cac61b1765e7bc53b106c851e7fdeaf57a0dd