| commit | 5b81de4de741f736889fd86e1dd324ad88136ebe | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Aug 29 20:07:56 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 29 20:07:56 2012 -0700 |
| tree | ee8f77c8cea0d6a5a541515c4cc9d8747b563716 | |
| parent | b07e89f6fdbf85d2f436dc67074793444462abf9 [diff] | |
| parent | 5f75aa15d7c1c5ea1c1eecd95bf2bb0920173eb2 [diff] |
Merge "Fix Camera and GoogleNow launching in keyguard" into jb-mr1-dev