OSDN Git Service

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
authorRaff Tsai <rafftsai@google.com>
Wed, 5 Jun 2019 09:13:22 +0000 (02:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 09:13:22 +0000 (02:13 -0700)
am: 09e255676b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407


Trivial merge