| commit | d9e0f6317625041fc5de0daabfa33f6192fce743 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 04:54:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 04:54:24 2016 +0000 |
| tree | 87e40fdd6b545a81fe8a034f6e96a1a4b1844f72 | |
| parent | 36db1abd44b151db4231dcca68609229bc6562a7 [diff] | |
| parent | 7556f0bc2c8ff359636068bf90f30e787c4b4cca [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: b197cd85a6 -s ours am: 7556f0bc2c -s ours Change-Id: I87d00559e30df8b0b78eb622e6539525cd1a8a4b