OSDN Git Service

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


Trivial merge