| commit | 0cf9428986d7ba2fbe0870b5fc1bbcc835270cbb | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jun 30 22:05:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 22:05:28 2016 +0000 |
| tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
| parent | 34134ee6b1c803ff49dbdde6a15458f3db359dee [diff] | |
| parent | 9b14186afe3da3f3a5f090df9cf585ac21c87e15 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 8181498163 -s ours am: 9b14186afe -s ours Change-Id: If6ba57a9d3afea7a6f76d0986988fbc9dbb70b6a