commit | 20625ebc5ba22b7b0d9a38a79a9a70e12143f6e2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 12 14:49:06 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 14:49:06 2015 +0000 |
tree | 41465293c3cb8ccc9852f176898119809bc8e832 | |
parent | f999d57278db3c12ce0911d83781978f657f8ede [diff] | |
parent | 49848a637a341d64317b0fcb371ca695919a8cd1 [diff] |
am 49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '49848a637a341d64317b0fcb371ca695919a8cd1': Import translations. DO NOT MERGE