commit | 346dd4881dd9f082dd0047c12b52b6e7698a8895 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 06:52:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 06:52:31 2016 +0000 |
tree | 856679f2d446325190cc3380b24246296a737563 | |
parent | 7aa97723932ae38b746eb11bc681e45a98d8ac05 [diff] | |
parent | 6abeadf69d7e2d8b7010dc2eb6de363462a7a119 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 0555bb3003 -s ours am: 6abeadf69d -s ours Change-Id: If0aa1679eb6a09080575ba4eb4b39833e04a8e5f