OSDN Git Service

Merge "Update airplane mode key to match framework constant" into pi-dev
authorMatthew Fritze <mfritze@google.com>
Wed, 23 May 2018 21:40:55 +0000 (14:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 May 2018 21:40:55 +0000 (14:40 -0700)
am: 6be5e331cf

Change-Id: Ifb10ad7d2dd23359dab8ee1307751a0b49082cbb


Trivial merge