summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2012-11-30 13:29:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-30 13:29:14 -0800
commitcc95712ea2eb07913d8a9964cd8266245f8c1fd6 (patch)
tree7f5e0f023da6a029385aea46195b0d387ba8af99 /media/jni
parentf004698fd0b19a48afb681945fc759b10341a8d0 (diff)
parent368016f769903df05ad5af51e8402dc372d5cd49 (diff)
downloadframeworks_base-cc95712ea2eb07913d8a9964cd8266245f8c1fd6.zip
frameworks_base-cc95712ea2eb07913d8a9964cd8266245f8c1fd6.tar.gz
frameworks_base-cc95712ea2eb07913d8a9964cd8266245f8c1fd6.tar.bz2
am 368016f7: am bd0e1808: am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev
* commit '368016f769903df05ad5af51e8402dc372d5cd49': Only show camera widget to setup users.
Diffstat (limited to 'media/jni')
0 files changed, 0 insertions, 0 deletions