| commit | b0f84b8b8c7fdef90da4f4cb01fbcbd373640931 | [log] [tgz] |
|---|---|---|
| author | Chiao Cheng <chiaocheng@google.com> | Wed May 14 00:08:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:08:08 2014 +0000 |
| tree | 79b4f0a092044a052be21ed30cb7c6728f4200d3 | |
| parent | 7ceffc79f5ed47b81e37f4841fbb83477d599a84 [diff] | |
| parent | e7506a99ae6635cbcda156b49db4d71a0ff86f4c [diff] |
am 99a3c1a2: am 35f767bc: am cd29be4c: am fa7dd751: am 59517317: Merge "Add logic to dynamic dismiss keyguard." into klp-dev * commit '99a3c1a28cf409649fabb306919531d64b04524f':