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:41:11 +0000 (02:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 09:41:11 +0000 (02:41 -0700)
commit4994dfff370a4924c0911279529e7223663518e9
tree262121e5a6b28d8d97e209a35f0551173eec46e4
parentf376fc4eccb12c4ec2677b7b0caf7a1ef17e2558
parentc212052f69288a3d960e91f5eb4145efd6f9e2e5
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours am: 64d4433a90 -s ours am: acac31e75a -s ours
am: c212052f69 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2e5316c8cb6737a74798cc9e6cfe0710d87e45e1