OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6990448 2b3cee7)
am 2b3cee71: (-s ours) am 18aafe57: am fca1c5ec: Defining broadcast intent strings...
authorDan Aminzade <monzy@google.com>
Wed, 30 Apr 2014 18:14:19 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:19 +0000 (18:14 +0000)
* commit '2b3cee71446e2468b534ac51103732c3d1e137ac':


Trivial merge
packages/apps/Camera2
About OSDN
Find Software
Develop Software
Help