commit | 4335e11b3c1f55eee79afadb630060482deead13 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri May 05 12:06:32 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 05 12:06:32 2017 +0000 |
tree | 2ddd1234564276c1392d72b840acb3844a43183b | |
parent | b9b2202f198911043de9674ecf41e8acc54bdc4d [diff] | |
parent | dfe401103064eff0a183defde619b3408afebff4 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 243e5be074 -s ours am: dfe4011030 -s ours Change-Id: I29bbf33e2bd3697ecbba5ae366d499b8db09a0ba