| commit | c212052f69288a3d960e91f5eb4145efd6f9e2e5 | [log] [tgz] |
|---|---|---|
| author | Raff Tsai <rafftsai@google.com> | Wed Jun 05 02:36:10 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 02:36:10 2019 -0700 |
| tree | 538774b556969dd4b097d207351e1271c57f8959 | |
| parent | 592e5c14917692cbd1544150ffa9eee6789ea645 [diff] | |
| parent | acac31e75ab2700c80ee5c751ddfc2f312e7385c [diff] |
[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: I2df0ab2ef87024ca20b4a05941505b581c27d8d7