| commit | 290b4e507c3d8e50a0d1a2da3d03ac1a54f7f35a | [log] [tgz] |
|---|---|---|
| author | Raff Tsai <rafftsai@google.com> | Wed Jun 05 02:29:51 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 02:29:51 2019 -0700 |
| tree | 80b9fe6a75bbbf0c16491ec02871aae2a792f225 | |
| parent | ca593c204abe9cc02573ad3f12a21e24f902d8ba [diff] | |
| parent | ba0122401d18989ce31f04dde774ef841404ef56 [diff] |
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history Change-Id: Ib7ded3d2c08e14e39922ad0f1dd1fb2dd3e27ab9