tree 74ce86d6903aa6c0599373aa4af2159e507ec939
parent 6fee8818700e435c5c4f8aa590259af4dd9e3eae
parent 2ca942bca7d55f83d14c0d4a84453a00d4b44302
author Tor Norbye <tnorbye@google.com> 1548067379 -0800
committer android-build-merger <android-build-merger@google.com> 1548067379 -0800

[automerger skipped] Merge "resolve merge conflicts of d2f906a6ad899827bf58df761eb11ef6646c80df to pi-dev-plus-aosp" into pi-dev-plus-aosp
am: 2ca942bca7 -s ours
am skip reason: change_id Ia248aece5250e84e47c815c601133b698bf644c2 with SHA1 68ea0c3c13 is in history

Change-Id: Ibff021a79d2252b3639dcfcfcceed3ec315bb6ea