OSDN Git Service

am 24e76b0a: (-s ours) am c421586c: am 5ed30cb7: am 68fc363b: Merge "Camera2 icon...
authorKevin Gabayan <gabayan@google.com>
Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)
* commit '24e76b0a5070fb993f13ee91e9cbddc6a8dcbb6a':


Trivial merge