| commit | a03869b29673479024387ad9a79cfaed8e614606 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 06:54:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 06:54:49 2016 +0000 |
| tree | 856679f2d446325190cc3380b24246296a737563 | |
| parent | ee05119cc59f61456645e9db666f701be26bee86 [diff] | |
| parent | 2fc6dfb4409c57f2c37b886cf98b2db3740723c0 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 12af7eb3ab -s ours am: 2fc6dfb440 -s ours Change-Id: Ie5fb82ab8b8827153b4bf7cfe372106d4da56f63