| commit | b67c41d281b13626e04595dc830941e47b7a3dbd | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Apr 01 22:27:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 22:27:00 2014 +0000 |
| tree | aaeb776ab4af52988dc32efa483d4ab35600c60c | |
| parent | 624818b0c133ac619996b2f0553b20fa060f6487 [diff] | |
| parent | 74ee938dcc5e1ab0309dd87278e26f604c756b26 [diff] |
am 74ee938d: resolved conflicts for merge of ffb22827 to master * commit '74ee938dcc5e1ab0309dd87278e26f604c756b26': Fix FLAG_DISMISS_KEYGUARD not working