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