diff options
| author | Jim Miller <jaggies@google.com> | 2012-10-02 13:58:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 13:58:01 -0700 |
| commit | c6e570dbadc3689bc80c0516492a3209d5f6742b (patch) | |
| tree | 39585f6150e5882004c8f02a1fbbdbdd0498de4d /core/java/android | |
| parent | c12dd973724f5aab44814b31650b4b47314e952b (diff) | |
| parent | ee82f8fa2d47fc1dbfc29582ae348b3c45ff8fe0 (diff) | |
| download | frameworks_base-c6e570dbadc3689bc80c0516492a3209d5f6742b.zip frameworks_base-c6e570dbadc3689bc80c0516492a3209d5f6742b.tar.gz frameworks_base-c6e570dbadc3689bc80c0516492a3209d5f6742b.tar.bz2 | |
Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions