tree b2aa4f41e7556c107518537e9cb3220b8d8b4f16
parent 4347321e35324f308e95257940781c43bc64c37a
parent 3c06e7e99346be0242bbee057f2c804855f41cdb
author android-build-team Robot <android-build-team-robot@google.com> 1525166222 -0700
committer android-build-merger <android-build-merger@google.com> 1525166222 -0700

Merge "resolve merge conflicts of 0eea822c79308473c37795e0c3360c36ed8802c4 to pi-dev-plus-aosp" into pi-dev-plus-aosp
am: 3c06e7e993

Change-Id: Ib5ff472ded575e15e8769dbab323a69125e43d9f