commit | f07c484227581327814873d5dabec8bc5c605f9c | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Aug 27 20:22:18 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:22:18 2015 +0000 |
tree | c223dc0587b5c4cbce365eb8c243746e05fa3a4b | |
parent | 34ea77018043eee55de7295657c408565fd5a56c [diff] | |
parent | e9cc771dee56c57566a3efaaa39aa3a4a708fec2 [diff] |
am e9cc771d: (-s ours) am 96d0e019: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'e9cc771dee56c57566a3efaaa39aa3a4a708fec2':