OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e288dff 2e63f2e)
am 2e63f2e6: am 5f16c140: am 5bca6f4c: Merge "Don\'t allow actions on items in progre...
authorAngus Kong <shkong@google.com>
Thu, 3 Oct 2013 22:41:43 +0000 (15:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Oct 2013 22:41:43 +0000 (15:41 -0700)
* commit '2e63f2e6779efd681dddcb36ff7d108cd92004fd':
  Don't allow actions on items in progress.


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