OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cae8686 6dee203)
am 6dee203a: am 6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into...
authorEino-Ville Talvala <etalvala@google.com>
Thu, 30 Apr 2015 18:39:38 +0000 (18:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Apr 2015 18:39:38 +0000 (18:39 +0000)
* commit '6dee203aee673eea91633d8557a4aa1ff21296cb':
  Camera2: LEGACY: Support prepare(), sort of.


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