summaryrefslogtreecommitdiffstats
path: root/tests/Camera2Tests/SmartCamera
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-09-04 19:49:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-04 19:49:26 +0000
commit75c6c90aa83b9e4b69bd7ec90a063590f6baa477 (patch)
tree7bb9213cb026e7749e4c60a8e071c8fc75378a7b /tests/Camera2Tests/SmartCamera
parentdf5c2a96272d540470360a03936ce360a5397c49 (diff)
parent4576f597078ade77c38a6432d8ae4edc85446db5 (diff)
downloadframeworks_base-75c6c90aa83b9e4b69bd7ec90a063590f6baa477.zip
frameworks_base-75c6c90aa83b9e4b69bd7ec90a063590f6baa477.tar.gz
frameworks_base-75c6c90aa83b9e4b69bd7ec90a063590f6baa477.tar.bz2
am 4576f597: am 9bfa0736: am 7119fbb6: am 4df075bc: am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT
* commit '4576f597078ade77c38a6432d8ae4edc85446db5': Resolve color xml attributes properly. [DO NOT MERGE]
Diffstat (limited to 'tests/Camera2Tests/SmartCamera')
0 files changed, 0 insertions, 0 deletions