summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorRachad Alao <rachad@google.com>2013-10-07 13:47:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-07 13:47:54 -0700
commitfe2ed8859a9c58d33d96c3557d94dc6fcde08257 (patch)
treed51ae6e666ba5e02610ad6c11344f8fce446028d /graphics/java
parentd6269b1575616911ee3bb694514a4a3181209249 (diff)
parent5be2d2af80716c08b8626046df8977dbf925df85 (diff)
downloadframeworks_base-fe2ed8859a9c58d33d96c3557d94dc6fcde08257.zip
frameworks_base-fe2ed8859a9c58d33d96c3557d94dc6fcde08257.tar.gz
frameworks_base-fe2ed8859a9c58d33d96c3557d94dc6fcde08257.tar.bz2
am 5be2d2af: am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev
* commit '5be2d2af80716c08b8626046df8977dbf925df85': Camera2: add metadata override
Diffstat (limited to 'graphics/java')
0 files changed, 0 insertions, 0 deletions