summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2020-04-07 18:31:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-07 18:31:31 +0000
commitf562ffc53e2e8c3cd926ad5543c3d94df0d2d9ec (patch)
treed9d6c2b1fa7f9b729430fd2c2d311e0b4678d7b8
parentb21fff2664369b528f4d878bf4dd586bc3a5476d (diff)
parent246360bf4f4102b916b678fc751fe2a3472c0b66 (diff)
downloadframeworks_base-f562ffc53e2e8c3cd926ad5543c3d94df0d2d9ec.tar.gz
frameworks_base-f562ffc53e2e8c3cd926ad5543c3d94df0d2d9ec.tar.bz2
frameworks_base-f562ffc53e2e8c3cd926ad5543c3d94df0d2d9ec.zip
[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours am: 246360bf4f -s ours
am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 24e0f76afc is in history Change-Id: Iaeaef57c62a009c0f4625dfe75fc0b17a96334c2
0 files changed, 0 insertions, 0 deletions