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