OSDN Git Service

[automerger skipped] Merge "Make the Settings permission a required module" am: 480b5...
authorAnton Hansson <hansson@google.com>
Mon, 14 Jan 2019 16:23:41 +0000 (08:23 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Jan 2019 16:23:41 +0000 (08:23 -0800)
am: 850fdb32e9 -s ours
am skip reason: change_id Ia2548355282498bceeffddb564de32a6cb857c66 with SHA1 16322a0271 is in history

Change-Id: Iab476273c6b332525177fe76f5f8d779ffe0f0c7


Trivial merge