tree 2693af6509e33106cf428ce2d621a6668d037463
parent 85efedf920a75a648f1ca28cd2bf1ef9c3f70c15
parent 4f2714628ce394ebc1a0f374335d8db501e9724c
author Alan Viverette <alanv@google.com> 1464208241 +0000
committer android-build-merger <android-build-merger@google.com> 1464208241 +0000

Merge "Merge "Revert "Fix build"" into nyc-dev am: 1b5ec362c2 am: d6558efbe0" into nyc-mr1-dev-plus-aosp
am: 4f2714628c

* commit '4f2714628ce394ebc1a0f374335d8db501e9724c':

Change-Id: If11a09e96ddfa923f6967903403071bffa177f50