commit | 5c6adb04369855fd7ec76011dcfc830605a744dd | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Apr 17 18:12:24 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 17 18:12:24 2014 +0000 |
tree | 651c569526b5d0384c84eaa070cc49c08cb6c640 | |
parent | f4ba09d6998c93c9e716fc9b543aab8ab18c58a9 [diff] | |
parent | 72f8056db184e48bc4bd4ebb4511d1b4de8fda14 [diff] |
am 72f8056d: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '72f8056db184e48bc4bd4ebb4511d1b4de8fda14': Import translations. DO NOT MERGE