commit fe964d8e0a89a5a31f529f7dde96656c310f4fd9
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Aug 27 13:54:02 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 27 13:54:02 2019 +0000
tree 39e728fcf91fcea3a7c745de2b46f076ab11a8a3
parent dad4e24ea789715a6e1721321e6c86337e02bdfe
parent b9133d291c205fdb82ac39423b6d5a4bbd693267

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

* changes:
  [automerger skipped] Merge "Fix assumptions in SensorsHidlTest.NoStaleEvents" into qt-dev am: 0436097a3f am: b30fe372e3 -s ours am: 87678817d6 -s ours am skip reason: change_id I83f0cb2f6e878244f3d94ae77f64bb8ed2f78e0b with SHA1 d8b212ec3e is in history
  [automerger skipped] Merge "VTS Sensor HAL 2.0: Fix Batch for One Shot sensors" into qt-dev am: 039eca1adc am: 8b34aa638c -s ours am: 23f22d8ead -s ours am skip reason: change_id Ib2287f6f11502c10d346f5e7216c5f31d585edf9 with SHA1 66d8297210 is in history
  [automerger skipped] Merge changes from topic "c2f2_sensors_vts-qt-dev" into qt-dev am: f1708d252a am: 56af492db3 -s ours am: ec09f9fe91 -s ours am skip reason: change_id I07e789157e051ceab488a61e856f17d50f435072 with SHA1 63d4f57976 is in history