| commit | 4a26f2993183467ce7c66d2544793f5deca826ab | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 18:57:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 18:57:41 2016 +0000 |
| tree | 20b3c2f7d1bada485389929acd45902cbd7bc56c | |
| parent | 067b529f405412af65020a9313c427067a7daae8 [diff] | |
| parent | 54231dfd68260fcf687a861a15fdee1e4ecff504 [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: ff25e24e6e -s ours am: 982b7c6e75 -s ours am: 54231dfd68 -s ours Change-Id: I8ef3b26c1812db71855c59be9d7abed92b68a404