OSDN Git Service

Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into...
authorRaff Tsai <rafftsai@google.com>
Wed, 5 Jun 2019 09:47:05 +0000 (02:47 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 09:47:05 +0000 (02:47 -0700)
commit5df942b0e9e0e746aa543bfb05473a60ca01e32b
tree2456b7c3d0dd8cf02afcb6db6fb5f42450452888
parent243eaaf17b6dbcebbfa5ab250b0a4fdd3842f1fe
parentf376fc4eccb12c4ec2677b7b0caf7a1ef17e2558
Merge "[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: 723fb8dc91 -s ours
am: f376fc4ecc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2c9d46d7f1a73e825283797ecd8aeccfee8834f1