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