| commit | 18a71ddd2a8d22c47f9b63f82a2108fb78e1650d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jun 30 21:52:39 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:52:39 2016 +0000 |
| tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
| parent | 01c443d59010df4c1d8f3ffea28a3990712a5468 [diff] | |
| parent | a9bfdd4dd239e5435eb63e5f68e4e808fc853b24 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: b10be9d131 -s ours am: a9bfdd4dd2 -s ours Change-Id: I5d6d7f623d6ed27bf0d132ebff335d3b136ea8e8