| commit | c6e570dbadc3689bc80c0516492a3209d5f6742b | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Oct 02 13:58:00 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 02 13:58:01 2012 -0700 |
| tree | 39585f6150e5882004c8f02a1fbbdbdd0498de4d | |
| parent | c12dd973724f5aab44814b31650b4b47314e952b [diff] | |
| parent | ee82f8fa2d47fc1dbfc29582ae348b3c45ff8fe0 [diff] |
Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev