commit c316af7ecfbfcb92fc126a01e7bde065fa54e3c8
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Aug 27 13:47:55 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 27 13:47:55 2019 +0000
tree 74deca7cc8c09382760126aabdadbcba09b57d1f
parent 87678817d65bdc7bf94f1141125a2aa2230abd0a
parent ab3e5fd33bda1fbfc25eca013846d7d1ed9994bb

Merge changes from topic "am-8700584e62cd434f85ab00d72db51e34" into qt-r1-dev-plus-aosp

* changes:
  [automerger skipped] Fix assumptions in SensorsHidlTest.NoStaleEvents am: bf23abb745 -s ours am: ab701a4131 -s ours am skip reason: change_id I83f0cb2f6e878244f3d94ae77f64bb8ed2f78e0b with SHA1 d8b212ec3e is in history
  [automerger skipped] VTS Sensor HAL 2.0: Fix Batch for One Shot sensors am: 694e6e829a -s ours am: f1317bfa88 -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 -s ours am: 3ca0b70b52 -s ours am skip reason: change_id I07e789157e051ceab488a61e856f17d50f435072 with SHA1 63d4f57976 is in history