diff options
author | Bill Yi <byi@google.com> | 2019-04-12 16:15:58 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-12 16:15:58 -0700 |
commit | 65b333a2cfcce35e7a4e2e7c064f7beb78e278aa (patch) | |
tree | d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d | |
parent | 03b7dbc891407872b076051d200f5173bca227ae (diff) | |
parent | 58685f02a2c25f461fc2506b8df1c0f3e13570fa (diff) | |
download | setupwizard-65b333a2cfcce35e7a4e2e7c064f7beb78e278aa.tar.gz |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8069da859c -s ours
am: 58685f02a2 -s ours
am skip reason: subject contains skip directive
Change-Id: I5686dfd9f4897ce3e134932ea7016be970058658
0 files changed, 0 insertions, 0 deletions