commit | 38e51b4504f2939fc694765788acb85a9166808e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 21 03:55:35 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 21 03:55:35 2016 +0000 |
tree | a2a4e4fe100910cb3a4848e17dd3d762588d4ebc | |
parent | 2384fc541d3eac1d13d1869a6e165a185e4b6c4a [diff] | |
parent | ffbdc55a1d065a0e08c719031e8b89f1d07f2f36 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 3638c9b330 -s ours am: ffbdc55a1d -s ours Change-Id: I6e0abeb5cf3064d95bb562ac8cca5d5b944b6316