| commit | acac31e75ab2700c80ee5c751ddfc2f312e7385c | [log] [tgz] |
|---|---|---|
| author | Raff Tsai <rafftsai@google.com> | Wed Jun 05 02:30:17 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 02:30:17 2019 -0700 |
| tree | 80b9fe6a75bbbf0c16491ec02871aae2a792f225 | |
| parent | 290b4e507c3d8e50a0d1a2da3d03ac1a54f7f35a [diff] | |
| parent | 64d4433a9019157eda9afc12f2d7ce171b8b7e2e [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 skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history Change-Id: I0588eac0a4abcb1003b09e5fab92894a8ddfc8f9