commit | 7942663bc6279c6da263c63867aa43bd663465e8 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 05:02:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 05:02:47 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 09b4c6f433d847531ef729de712346c747348a96 [diff] | |
parent | 721e972633746a1a25e900ee6cad0c7f110e6a2a [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 2ebc49de87 -s ours am: 721e972633 -s ours Change-Id: Ia1d0f2fef183cc0f81902bbf5c5a229d5b6436b4