tree 06f904d6373181804a15745d5285df1259f563bd
parent ea2a494f4fa12eea06fa5ccccf73c23b9a0a4db4
parent 0ab28b78bd06a06a0ffa150cef5876d56212902a
author Tucker Sylvestro <tuckeris@google.com> 1475780988 -0400
committer Tucker Sylvestro <tuckeris@google.com> 1475781063 -0400

resolve merge conflicts of 0ab28b7 to nyc-mr1-dev-plus-aosp

Test: Built with ". build/envsetup.sh && lunch shamu-eng && make -j32"

Change-Id: I4b3081c2b9091fa2d66c717f5d57dc6e567c50e2