OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54cf0db b35bada)
am b35badac: Merge "Camera2: Unhide some capture request templates"
authorZhijun He <zhijunhe@google.com>
Sat, 15 Feb 2014 01:54:37 +0000 (17:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 15 Feb 2014 01:54:37 +0000 (17:54 -0800)
* commit 'b35badac43f742456c4111d1d7369a216409c6f0':
  Camera2: Unhide some capture request templates

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