summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-05 14:18:38 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-05 14:18:38 -0700
commit5d7bf4dce568d1fa6863fdf10eeeeb7d1f265825 (patch)
treed4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
parentf51db88f7e1f99e5f1467d7abede580766ccfc5b (diff)
parent2cdd50295e07d1cd56814bb82f300bfee7ec19ae (diff)
downloadsetupwizard-5d7bf4dce568d1fa6863fdf10eeeeb7d1f265825.tar.gz
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 3343873fa1 -s ours am: 8d58738c9f
am: 2cdd50295e Change-Id: Ie14f404ff1f467c487b67b4bb777f8d9f4ffb0e8
0 files changed, 0 insertions, 0 deletions