tree f64558bed0fcc0a384f60e891822fd0c8c423c30
parent 8be92edaf4fd4f65552606e687d5cb09191e7d36
parent cf82e6703d873a59309f022b1c4bf78410d17cb2
author Xin Li <delphij@google.com> 1599796768 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796768 +0000

[automerger skipped] Merge Android R am: 11272c6a1c -s ours am: cf41335501 -s ours am: ad6e32582a -s ours am: cf82e6703d -s ours

am skip reason: Change-Id I977fffd03c77413dbec648254a59dfcb1cd23d8f with SHA-1 927e419715 is in history

Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1422294

Change-Id: I00efb0c1276e69af9304e9225e1e7107f21b8e73