commit | 78e37a132ede80d202ff510d2307f667d91c3e95 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 18:57:42 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 18:57:42 2016 +0000 |
tree | 20b3c2f7d1bada485389929acd45902cbd7bc56c | |
parent | 4a26f2993183467ce7c66d2544793f5deca826ab [diff] | |
parent | 76d6144ea7df11118e34229742068cd0b08198b1 [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: c6a6ef7e38 -s ours am: 54f2d178f6 -s ours am: 76d6144ea7 -s ours Change-Id: Ia7f5a5498cb1d406d4f1dc79009d9cdc4ecf8660