tree 09dbc7e1eef4eb75f5009371be9b3082b8adca1e
parent f5ff1e139e718d9c76edc2d8a11807936778ad97
parent 116b6cef23521745f86b21633f6e0e865782fda6
author Justin Yun <justinyun@google.com> 1522867178 -0700
committer android-build-merger <android-build-merger@google.com> 1522867178 -0700

resolve merge conflicts of 594542257a0f89bd1737a1dec71e0551ebb4d5af to pi-dev-plus-aosp
am: 116b6cef23

Change-Id: Idfeb1f4fd81c578d574830ca591572463e41dd79