| commit | ffad9d5ad07f9dce14cb01755b79a48edea744e1 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 18:58:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 18:58:24 2016 +0000 |
| tree | 20b3c2f7d1bada485389929acd45902cbd7bc56c | |
| parent | a7b01f5cdab838820c33a4f6bf21477f97fdd1b7 [diff] | |
| parent | 7942663bc6279c6da263c63867aa43bd663465e8 [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 2ebc49de87 -s ours am: 721e972633 -s ours am: 7942663bc6 -s ours Change-Id: I8fce54b632d060899b812fe6c1571b7bba3fa3fd