OSDN Git Service

[automerger skipped] Merge "Policy transparency dialog should be shown when SwitchBar...
authorYueming Wang <yuemingw@google.com>
Wed, 2 May 2018 15:15:05 +0000 (08:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 May 2018 15:15:05 +0000 (08:15 -0700)
am: 5221bbab26  -s ours

Change-Id: I198fb14f3d66fa1a36bf90857ae6e0183ba2c163


Trivial merge