| commit | a14b138b8fa96b41e831e7e1f2137624ed60da4c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 00:09:26 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 00:09:26 2016 +0000 |
| tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
| parent | 76d6144ea7df11118e34229742068cd0b08198b1 [diff] | |
| parent | db31f709f1799f78c3afce7543f225e97848a40a [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: c228036f0a -s ours am: db31f709f1 -s ours Change-Id: I029eb36ad1e07424ba001a7e3851c7ff97c2a24d