OSDN Git Service

(root) / android-x86 / system-media.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f72ab2a f35f6ce)
am f35f6ce7: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 May 2013 22:30:17 +0000 (15:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 May 2013 22:30:17 +0000 (15:30 -0700)
* commit 'f35f6ce75375b05634a0acb332635e1954058336':
  camera_metadata: Add supportedHardwareLevel field


Trivial merge
system/media
About OSDN
Find Software
Develop Software
Help