commit | b7f917485c4ee91889d7772bb9337dde6bce004a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 02:04:09 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 02:04:09 2016 +0000 |
tree | cce35e9b04e4971de4aa05635f9f69b39a8c4e41 | |
parent | 690a8407c934a852fbb8b3a848ab5114cb15de9e [diff] | |
parent | a1a953be7e70a2213f0b25dd0f26d58c9f97088f [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0b555bb27d -s ours am: 9a82f273a8 -s ours am: a1a953be7e -s ours Change-Id: I66cebcb5399ede8fc713c9107d34f23d4b69c887