commit | bb4e4f0c2977f0efd569f7c84dfcbad21bffb792 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat May 25 13:15:07 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat May 25 13:15:07 2019 -0700 |
tree | d046148c0e34c767d1f17f136de8255ba7b24be7 | |
parent | 6078888960a389198ec449e8a79e2255e395a23e [diff] | |
parent | 8d79ad6f12e04ee5dbf149dec85cfa2042039bd7 [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 280cae0879 -s ours am: d829106de3 -s ours am: 8d79ad6f12 -s ours am skip reason: subject contains skip directive Change-Id: I1f6c4c6d440754b445bd8658b25ec83e9f32a008