commit | 3933c79c51298e5c06196ec79efa54a64c4a731a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Sep 26 19:27:21 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 26 19:27:21 2017 +0000 |
tree | 35405648023ecc04cea3230854f4b1d299b404a8 | |
parent | ded30a1d55133600d1cd22ee80e008b375d55423 [diff] | |
parent | 9adc60ffe0e38f60def9a0d0b088b6e0e353435e [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 4414109220 -s ours am: 46181531ec -s ours am: c03209d495 -s ours" into oc-mr1-dev-plus-aosp am: 9adc60ffe0 -s ours Change-Id: Ia02750f919deebd14dbe76058f688b6893db5462