[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 8d040eaa88 -s ours

am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/20132575

Change-Id: Ia5d9d6b8a307936ad57749bf9cc6a00a6360860f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 46f1e0ec90ff0a15c733733a6c1f8dd693c5f8c5
  1. powerstats/
  2. device.mk
  3. OWNERS
  4. README.txt