commit | 2a99d013239385f838449af2c5ec9bb31dbfa84e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 03:28:59 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 03:28:59 2016 +0000 |
tree | e0f5bab73f038bc3d67b30457d694d1dba3168d2 | |
parent | 54e04be8172d1527059d65f9c1dc05d50302cd9a [diff] | |
parent | 791de14f4c106d6e1db175fba3383d1c9fb8fa38 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372 -s ours am: 791de14f4c -s ours Change-Id: I1a04ddb396b18178af5d05b38b7174b0fe5394cc