| commit | 8d1e86d054c9d2a9bdec2a0c9d454ddf21768031 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Nov 14 18:20:53 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 14 18:20:53 2013 -0800 |
| tree | 029d4f2ffb0d00806056303fd20fa1585b8d043f | |
| parent | 2bced6dcb53c1743d6d11ffcb213206a07a63737 [diff] | |
| parent | 1907c0d280d97776708810c9d24931aa6f818790 [diff] |
am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev * commit '1907c0d280d97776708810c9d24931aa6f818790': Don't show external presentation until keyguard actually shows