tree b26665ac612a03d1047cc710c29cf430f87b1155
parent 024767ed1add35abc5dcce5d4a619cb5899dfe6e
parent 4048d32e48e128ec4d9f29f1dc5f70e7d20e278c
author andychou <andychou@google.com> 1552149903 -0800
committer android-build-merger <android-build-merger@google.com> 1552149903 -0800

[automerger skipped] Merge "resolve merge conflicts of 04d262db157f15c2d822708e57715d80e3f14585 to pi-dev-plus-aosp" into pi-dev-plus-aosp
am: 4048d32e48 -s ours
am skip reason: change_id I2c7feea798df2d9bbfae4ee0847ef151b0d21511 with SHA1 0011121317 is in history

Change-Id: I6a563f965bb0e4aaed05e7196e0a795cb8b38b18