summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-04-12 15:53:49 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-12 15:53:49 -0700
commit58685f02a2c25f461fc2506b8df1c0f3e13570fa (patch)
tree86572917c18244f76bda58a0753e52c957164227
parent1e287c445996ed21c64ec942c30931f6321ff288 (diff)
parent8069da859cf0cc2721b35148aea4e29722004939 (diff)
downloadsetupwizard-58685f02a2c25f461fc2506b8df1c0f3e13570fa.tar.gz
[automerger skipped] Merge "Import translations. DO NOT MERGE"temp_b_131756210_stage-aosp-master
am: 8069da859c -s ours am skip reason: subject contains skip directive Change-Id: Ibb271460e1e291a8d57eae9bcba04874c5fc1b3c
0 files changed, 0 insertions, 0 deletions