am 319d1bff: (-s ours) am bc6347e4: am 88aa6f15: am 4de90cf0: am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit '319d1bfffb8a53bbc542f80c518509876eee6231':
  Add missing resolveResValue call. [DO NOT MERGE]