commit | 61690a25f8deee67a92440fc5de1d50f3c8ebb48 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue May 09 22:38:32 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 09 22:38:32 2017 +0000 |
tree | 12db1a39ec3a5482ffb762e3a63e5a1f92ed26cb | |
parent | 33a94147d7af0db36ef0ca18b2d4b90800794639 [diff] | |
parent | e4cc75de2c908d8077a240396c0c4807ddefa89a [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 36db49ecbf -s ours" into oc-dev-plus-aosp am: e4cc75de2c -s ours Change-Id: Ibf414074c4f9ee3d69464387a53b8148516e86ca