tree 0b8eccd2c608900b5c076fccd9c028e94c76b160
parent da42c6999c3256a5804584ec682073af97c8ebc3
parent dde8deb950a09c381aedc2c13bfd3f9202263d4b
author smain@google.com <smain@google.com> 1472838791 -0700
committer smain@google.com <smain@google.com> 1472838791 -0700

resolve merge conflicts of dde8deb to nyc-dev-plus-aosp

Change-Id: I5581b6a4b27ec78b8610f2911896b17a710dbd19