tree a93bf849c2f5c22cee6b3cd763b2590f6adec174
parent c9f04b94b109cda7cde4c24e208c1c9bb5e1fc22
parent 92eb0205a23658d5f188cf536b237a56de0eb77d
author Philip P. Moltmann <moltmann@google.com> 1561784269 -0700
committer android-build-merger <android-build-merger@google.com> 1561784269 -0700

[automerger skipped] Merge "Disable historical appops" into qt-dev am: 16128cc7a2 am: 4f7f78cce5
am: 92eb0205a2 -s ours
am skip reason: change_id I6debd3cbb6768b256eb558a81ba13efea375769b with SHA1 1353bc5b76 is in history

Change-Id: I3fde4bacffac16c78b1fd0ce2d857442230eefec