Merge changes from topic "am-81d748f13a154bfab7cb10360bb1c1a7" into qt-qpr1-dev-plus-aosp (cc546b06) · Commits · e / os / android_frameworks_base

Commit cc546b06 authored Sep 12, 2019 by Android Build Merger (Role) Committed by Android (Google) Code Review Sep 12, 2019

Browse files

Merge changes from topic "am-81d748f13a154bfab7cb10360bb1c1a7" into qt-qpr1-dev-plus-aosp

* changes:
  Merge changes from topic "bp-135269143-p" into pi-dev am: 604d91d7 am: bf25aeaa am: 4dd2150e am: d274ec88
  [automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 216bbc2a -s ours am: 06cf16b8 am: 844fa00a am: a94619ab

parents d140462a 59a74674

Hide whitespace changes

Inline Side-by-side

Please register or to comment