| commit | 6a80dea20a384a09144a91ac797a30529acc3a75 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Jun 10 21:25:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 10 21:25:32 2015 +0000 |
| tree | 441313ac550a524eb887ae0dcd8d6bd8dc0d655b | |
| parent | 7b92ebed1d273226e28b91ab7963922db87bf79b [diff] | |
| parent | 09425e506948648a469e2ed0b244fc65c85fafc0 [diff] |
am 09425e50: Merge "Update DPM strings for keyguard features" into mnc-dev * commit '09425e506948648a469e2ed0b244fc65c85fafc0': Update DPM strings for keyguard features