commit | 4b173f14c7342a07e5509a05db40e30ac8d0dbd6 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 27 03:16:38 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 27 03:16:38 2017 +0000 |
tree | e601819025412b76d21724e51f2d45c4aca70c51 | |
parent | 4ac07380b2bc5603cb7615ebdeae5785a79c3689 [diff] | |
parent | c015001f98541e0bf88f77488b5430b2ba1a0154 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: 1e8ed22be2 -s ours am: 9b16c7b2bb -s ours" into oc-mr1-dev-plus-aosp am: c015001f98 -s ours Change-Id: I4acc5b60ba716f7f57e74f1744a4bb138dc6d073