commit | 58df3f4b2e6a8b8a1d2944ab4461e5a6b208dccf | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 22 13:47:47 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 22 13:47:47 2017 +0000 |
tree | 1fa6669d44ca78cff009d06ba9ed36dc51e7be07 | |
parent | 53988d9f8dc3656f4b7ecae75168fcb8da0bd1e1 [diff] | |
parent | 70c2a7b0d99e14a4760bea6522a1f30055ae3b91 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c -s ours am: 70c2a7b0d9 -s ours Change-Id: I6559d4e1d46cd96e4c40a01c789b58cc41069b88