OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9408be9 8954f6f)
am 8954f6f0: Merge "Camera2: Add OFF_KEEP_STATE mode"
authorZhijun He <zhijunhe@google.com>
Sat, 8 Feb 2014 00:38:33 +0000 (16:38 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Feb 2014 00:38:33 +0000 (16:38 -0800)
* commit '8954f6f0b2187f1d8269718df022fc618b581720':
  Camera2: Add OFF_KEEP_STATE mode

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help