| commit | 592e5c14917692cbd1544150ffa9eee6789ea645 | [log] [tgz] |
|---|---|---|
| author | Raff Tsai <rafftsai@google.com> | Wed Jun 05 02:35:45 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 02:35:45 2019 -0700 |
| tree | 538774b556969dd4b097d207351e1271c57f8959 | |
| parent | a9125587a45956368ecac224ffe5637031d4792d [diff] | |
| parent | 290b4e507c3d8e50a0d1a2da3d03ac1a54f7f35a [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: 290b4e507c -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history Change-Id: I7339c87760c9aac2c435178b03b62a936f498662