| commit | ba0122401d18989ce31f04dde774ef841404ef56 | [log] [tgz] |
|---|---|---|
| author | Raff Tsai <rafftsai@google.com> | Wed Jun 05 02:24:54 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 02:24:54 2019 -0700 |
| tree | 20e7e6556f0a3b612d4ae73caeec54dc5c5d65ea | |
| parent | e7c298885bdbd04c199240a34073e0e66396bbbb [diff] | |
| parent | 5a326027db876c095e7d9fdee480a7a21cb42e2b [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 skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history Change-Id: I923b0a55fd8458fa30295fa1f9ca7a31f13d2734