[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" am: f9b69119bf am: 44022a761d

am: 1eaa996e29 -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 5764173a9f is in history

Change-Id: Iad15c30ffb2ac954a9cfde98deaae73786ec61ce
This commit is contained in:
Junyu Lai
2019-07-07 19:56:33 -07:00
committed by android-build-merger

Diff Content Not Available