diff options
author | John Spurlock <jspurlock@google.com> | 2012-11-30 13:29:14 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 13:29:14 -0800 |
commit | cc95712ea2eb07913d8a9964cd8266245f8c1fd6 (patch) | |
tree | 7f5e0f023da6a029385aea46195b0d387ba8af99 /media/jni | |
parent | f004698fd0b19a48afb681945fc759b10341a8d0 (diff) | |
parent | 368016f769903df05ad5af51e8402dc372d5cd49 (diff) | |
download | frameworks_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