| commit | 05c0ebdea400da4ba0e8b0a3484c57ac27f310fc | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Jun 10 23:16:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 10 23:16:33 2015 +0000 |
| tree | 2e410122d337448f50d2f51f74ef78cb8c0eb543 | |
| parent | aa773e8df75ba1844077782e0a775263a3d05b71 [diff] | |
| parent | 6a80dea20a384a09144a91ac797a30529acc3a75 [diff] |
am 6a80dea2: am 09425e50: Merge "Update DPM strings for keyguard features" into mnc-dev * commit '6a80dea20a384a09144a91ac797a30529acc3a75': Update DPM strings for keyguard features