| commit | c354c0fb8d70f54a266cd0b84a52dc1c0900dabe | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:21:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:21:20 2014 +0000 |
| tree | 6cc922b18cb72799525218d64e5dcb4757b03131 | |
| parent | 573ac636a90ede2a573b0414ca725b25f0b78ac2 [diff] | |
| parent | 16b3c3750f9a6ea13f313eb5e76ae3adbfb6fc83 [diff] |
am 16b3c375: am 026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev * commit '16b3c3750f9a6ea13f313eb5e76ae3adbfb6fc83': Import translations. DO NOT MERGE