| commit | bee654ede25ddf371a36c1166a675f4ca695de45 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 18:57:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 18:57:44 2016 +0000 |
| tree | 20b3c2f7d1bada485389929acd45902cbd7bc56c | |
| parent | 9aa8bb383ac2c62fe1bfa09e805901f48b02e1fc [diff] | |
| parent | 2ecd2c541a63a53615b83010b1700f7f52ccce50 [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 464f60e489 -s ours am: ca24f0f89b -s ours am: 2ecd2c541a -s ours Change-Id: Ibc6157f4d2f2375ee89c41bc535d92e33b38bf71