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