| commit | a40ae4f0d30161da14fe56ec66ff1ab9c074b7eb | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 06:52:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 06:52:33 2016 +0000 |
| tree | 856679f2d446325190cc3380b24246296a737563 | |
| parent | 346dd4881dd9f082dd0047c12b52b6e7698a8895 [diff] | |
| parent | 560ad742400a74accec0b5a9cb9182ac59c3550d [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 11b2b26911 -s ours am: 560ad74240 -s ours Change-Id: I4ca2a4b5cb10013f02999eb67c3fd6b87c5dec74