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:47:30 +0000 (02:47 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 09:47:30 +0000 (02:47 -0700)
commit82e42390cc883e61cedd5454f09eab293ce72d05
tree2456b7c3d0dd8cf02afcb6db6fb5f42450452888
parent5df942b0e9e0e746aa543bfb05473a60ca01e32b
parent4994dfff370a4924c0911279529e7223663518e9
[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: 4994dfff37 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2362b0023cb47997d68361bbd95059a2fec0a8ac