tree f61c385764e2a47f73fbc702117dac2f08babd79
parent 9c0d309e2b9d8db9f980984114e934857f6fcb6a
parent 991a9b920059afce5c739eda3d72a0023836375d
author Brad Ebinger <breadley@google.com> 1502820448 +0000
committer android-build-merger <android-build-merger@google.com> 1502820448 +0000

resolve merge conflicts of 7b9e7dc34 to stage-aosp-master am: a7a147eb8f
am: 991a9b9200

Change-Id: I25932e47408668696b0a010810df13130eb81125