| commit | 36db1abd44b151db4231dcca68609229bc6562a7 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 04:36:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 04:36:48 2016 +0000 |
| tree | 87e40fdd6b545a81fe8a034f6e96a1a4b1844f72 | |
| parent | 40620c6443c49cf7b3dc2e9d5cf44b36efcf2445 [diff] | |
| parent | 430ad959853cf053c317ad256b8613e05d29f5fe [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 8b833b1032 -s ours am: 430ad95985 -s ours Change-Id: I0e8adf6bac84484475e45acf83e67ef2b1884c50