commit | c45c2da5d527a9a1a9478eea87de8b459b808b40 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jul 07 16:41:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 07 16:41:05 2017 +0000 |
tree | f697d0bab4efb2c239b998513a65061e66f8b871 | |
parent | 1598f87f573c37908258c8d7d47189d82b76cd10 [diff] | |
parent | fa5e729d42adf9201df81d8db7018e8420ee1d11 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 33393ffa7d -s ours" into oc-dr1-dev-plus-aosp am: fa5e729d42 -s ours Change-Id: I0a36309f48acc52c9185ee49652cb36b3b7ce674