OSDN Git Service

[automerger skipped] Merge "Establish permanently unavailable settings" into pi-dev...
authorMatthew Fritze <mfritze@google.com>
Wed, 9 May 2018 21:35:52 +0000 (14:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 May 2018 21:35:52 +0000 (14:35 -0700)
commit5e14f5afc98d4ff992544883c4dbf0d060ea5ae9
tree834fd850342ec7fe252311c65a95dca3eb315646
parentbfcedc54b0182c6910099cc1b00e5bd18fe22012
parent57c000113fb9374728cf365dd8a932de37a969d6
[automerger skipped] Merge "Establish permanently unavailable settings" into pi-dev am: ab68a8107c
am: 57c000113f  -s ours

Change-Id: I2f4b619271e987fc42991458b677307303e414f7