diff options
author | Jorim Jaggi <jjaggi@google.com> | 2014-10-04 00:11:22 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-04 00:11:22 +0000 |
commit | 23f0778983b511f7dece86515f59aca251db1053 (patch) | |
tree | 9125043d7d527af1d623d469d4695f1307c15002 /packages/SystemUI/res/values-ja | |
parent | 850270d5aa1753f7ca6e4fa009a288d10dd526c6 (diff) | |
parent | 3c6300da713a7407a3fcfba126ef912ea7bc21bc (diff) | |
download | frameworks_base-23f0778983b511f7dece86515f59aca251db1053.zip frameworks_base-23f0778983b511f7dece86515f59aca251db1053.tar.gz frameworks_base-23f0778983b511f7dece86515f59aca251db1053.tar.bz2 |
am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev
* commit '3c6300da713a7407a3fcfba126ef912ea7bc21bc':
Fix blank Keyguard #4
Diffstat (limited to 'packages/SystemUI/res/values-ja')
0 files changed, 0 insertions, 0 deletions