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:35:44 +0000 (02:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 09:35:44 +0000 (02:35 -0700)
commit723fb8dc914e9915807e5691d8b145669019c0ce
tree63d8603cbf9a9a12a6cdf5fea355f0cca61934e9
parent7d3edc88a970d14dfeb1599c60047122df3835bd
parent290b4e507c3d8e50a0d1a2da3d03ac1a54f7f35a
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours
am: 290b4e507c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I591d8c07e4e21109315a9b7b600b52ba7000c3cc