OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afee88c 9a5a2c5)
am 9a5a2c5b: (-s ours) am f6ed47dc: am c065ae53: am 3772d2f4: restore Usage Statistics
authorSeth Raphael <magicseth@google.com>
Wed, 30 Apr 2014 18:14:46 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:46 +0000 (18:14 +0000)
* commit '9a5a2c5b2236a36ffebc74e2f6454349b897c268':


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