OSDN Git Service

am 3dd5f10c: (-s ours) am 4f78acab: am c0dd6624: am 761306fa: Remove CameraUtil.launc...
authorAlan Newberger <alann@google.com>
Wed, 30 Apr 2014 18:14:53 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:53 +0000 (18:14 +0000)
* commit '3dd5f10cd5e0ed7566fa3c16db3fc70d638047ef':


Trivial merge