OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d9b69b 12e9f69)
am 12e9f699: (-s ours) am 914970b4: am d38b1302: Merge "DO NOT MERGE: Hide new camera...
authorEino-Ville Talvala <etalvala@google.com>
Mon, 14 Oct 2013 17:51:04 +0000 (10:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Oct 2013 17:51:04 +0000 (10:51 -0700)
* commit '12e9f699130458e39d15becf05f993c7429a38fa':
  DO NOT MERGE: Hide new camera API.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help