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