| commit | 76d6144ea7df11118e34229742068cd0b08198b1 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 00:09:26 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 00:09:26 2016 +0000 |
| tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
| parent | 54231dfd68260fcf687a861a15fdee1e4ecff504 [diff] | |
| parent | 54f2d178f6f4c474822425cf41dde971879c3a14 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: c6a6ef7e38 -s ours am: 54f2d178f6 -s ours Change-Id: Id243448f995e9f5c2c21bf86a6eff2e54d0034e2