| commit | 3e1ae794285e0b6a9ce8a4beedec93599881faeb | [log] [tgz] |
|---|---|---|
| author | Raff Tsai <rafftsai@google.com> | Wed Jun 05 02:19:30 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 02:19:30 2019 -0700 |
| tree | 3c825126c7d907c803fb33660f538506c6fa0a10 | |
| parent | 5a326027db876c095e7d9fdee480a7a21cb42e2b [diff] | |
| parent | 14302b3ac6ed9de1270c228f36cec9f2605f8eeb [diff] |
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history Change-Id: Ic1ddb22a97d9058d5e40b8fddfb3f6f4ef40e150