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:36:08 +0000 (02:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 09:36:08 +0000 (02:36 -0700)
commitb1e65ea2afabb79a05d56b5b409fc14bfdc04c37
tree63d8603cbf9a9a12a6cdf5fea355f0cca61934e9
parent723fb8dc914e9915807e5691d8b145669019c0ce
parentacac31e75ab2700c80ee5c751ddfc2f312e7385c
[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 skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ib8f332a5ac80342106e25b07e5f40fb740fca033