OSDN Git Service

am 0838d693: am 18422419: am a98b4b10: Merge "boatload of new assets" into ub-camera...
authorSpike Sprague <spikuru@google.com>
Wed, 27 Aug 2014 17:59:50 +0000 (17:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Aug 2014 17:59:50 +0000 (17:59 +0000)
* commit '0838d69344926eac4684a2722e367f4724d5eea3':
  boatload of new assets


Trivial merge