commit | fb26ea4356d56e5b04ca715d423e1976f19148d8 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 12 16:15:26 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 12 16:15:26 2019 -0700 |
tree | 7239e356814f0aea404ca33a268db0f737a297c6 | |
parent | 75204a8e8c3ff29695cd2a05b2e133f8fdb581bc [diff] | |
parent | 1a129bc680506330b319ee1769e99739bc0ee49b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 74937235a5 -s ours am: 1a129bc680 -s ours am skip reason: subject contains skip directive Change-Id: I92a8a974eaf5b5e16374d71a72ddc633e11dc76a