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:18 +0000 (02:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 09:41:18 +0000 (02:41 -0700)
commitadbec0222cd8992a93ccbd903201618d161b0bbe
tree262121e5a6b28d8d97e209a35f0551173eec46e4
parentf376fc4eccb12c4ec2677b7b0caf7a1ef17e2558
parentb1e65ea2afabb79a05d56b5b409fc14bfdc04c37
[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: b1e65ea2af -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I52161c8578ef4d869b460450291d6bc3ee083431