| commit | 54231dfd68260fcf687a861a15fdee1e4ecff504 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 00:09:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 00:09:25 2016 +0000 |
| tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
| parent | 2b9f890306ab4d9c163f9dfcc4bf67ed6f9a72ab [diff] | |
| parent | 982b7c6e75ae21936e6c0cedfc79932d1307221b [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ff25e24e6e -s ours am: 982b7c6e75 -s ours Change-Id: I7f1db33517b7dedf9efe99d4141edcebe3cf6054