commit | 61e096c9ccc62bc78963b2f4db4a351ac74464b5 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Dec 08 18:37:35 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 08 18:37:35 2016 +0000 |
tree | 66820b5afd1a44067a3cef45a71d3f76831df6fe | |
parent | dcb8431521d52cd0123f8ccfbcb5a38bb456c311 [diff] | |
parent | 7892ea03f23877d56b904602b964346757510f5d [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: 462d9a3335 -s ours" into nyc-mr2-dev-plus-aosp am: 7892ea03f2 -s ours Change-Id: I339f03cf28bb17f366dc418ff4dd258f71f952c4