tree 0304cb549ebc65e857f93971401d76109665b84e
parent 860d3a2ab27141827c67e76dd32c179a8fd5e6fc
parent 19eedc1228af3f9f31220d1dc754d21913b57903
author Andy Hung <hunga@google.com> 1587578863 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587578863 +0000

[automerger skipped] Merge changes Ibca1d27b,I8cc6f5ce into rvc-dev am: 6d5625c5ce am: d23c15bdb5 am: ff3520a327 am: 2d504de93c -s ours am: 19eedc1228 -s ours

am skip reason: Change-Id Ibca1d27baca3bea6c5c363c7ef0dbce04fe5debc with SHA-1 6983695951 is in history

Change-Id: I712d6f25f6fb146568ff8e4ce62c5aeeededd6b5