commit | ed30217c423c02265ab515def36f942de5f15e2f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 13 00:43:00 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 13 00:43:00 2017 +0000 |
tree | 0c7ffebfe98b47fe434d499bf00905eac5669b63 | |
parent | 4fabf266b7ff3da612dbce4a4306a4a06b3153dc [diff] | |
parent | 5a3998fe38b4249ca45f883153618bf772b8581a [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours am: 5a3998fe38 -s ours Change-Id: Ic55a5b3c7cc13af454abc3fbb4f1dba7be64d107