commit | 7000298687f209fd9b7d0dc9fac0daef261ec557 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Jul 26 23:42:57 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 26 23:42:57 2017 +0000 |
tree | 02e9962c13ac600ddc831d7e9e7c6be68c4f6299 | |
parent | 5c7bf3574e7a770f8b580e8df6b3c66c15f41c0c [diff] | |
parent | ab60d6b44e1f4df22e324dd194dc9e1e8aca2513 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours am: cccb304acf -s ours" into oc-dr1-dev am: ab60d6b44e -s ours Change-Id: I887e494fc178972d6941f5c8cbfe64fb0109dd0e