OSDN Git Service

Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com...
authorbulic <bulic@google.com>
Mon, 15 Sep 2014 18:00:30 +0000 (18:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Sep 2014 18:00:30 +0000 (18:00 +0000)
commit03b99c42afcbe367f4db6358b7e76510106b8a43
tree34f4c9da47b0b28146ab48bed84020fa57110767
parentb40e7d2834030fd3bd80f17eed27c7e0265e2d7e
parent909506d73801fb0036c076220e7c92cd928d12aa
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Camera2 into lmp-mr1-dev-plus-aosp