commit | a9bfdd4dd239e5435eb63e5f68e4e808fc853b24 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 21:48:49 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:48:49 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 20ac4e9923b67b1d76d9870e52cd23a48616c56c [diff] | |
parent | b10be9d1310fd6f03f43ab79fe6e0c512b49e7d6 [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: b10be9d131 -s ours Change-Id: I12b1529c1f983c047e4a1d633ae98a5d0054a65d