commit | 80fea5de92cad202a647135402334c8923131896 | [log] [tgz] |
---|---|---|
author | Raff Tsai <rafftsai@google.com> | Wed Jun 05 02:12:49 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 02:12:49 2019 -0700 |
tree | a814ec260d443fb0b73d1c0c2ad78221b2c625cf | |
parent | c808f15cbe006df2136ae419870e10eabb585c48 [diff] | |
parent | 8c612b1334d08ac14324da6e353af433af995fd6 [diff] |
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history Change-Id: I252ffcb3e7c5f1be519c9e809d6b43a296bcbe9d