diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-01 21:48:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 21:48:04 +0000 |
| commit | 2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6 (patch) | |
| tree | f6224884e544ba51f64a27284be1d3db48751879 /location | |
| parent | 17bbd976c0971f25447b2ce66117f08029dc2fa9 (diff) | |
| parent | c70f15fe298655de02c2e72023fafe6fc33d2a55 (diff) | |
| download | frameworks_base-2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6.zip frameworks_base-2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6.tar.gz frameworks_base-2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6.tar.bz2 | |
am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
Fix FLAG_DISMISS_KEYGUARD not working
Diffstat (limited to 'location')
0 files changed, 0 insertions, 0 deletions