tree dab5ce13a2e273f1126c243fd6326d2cbb0792ae
parent da631f5894b2cfb77e47179a0f401c266b5eedb1
parent c73c64a699df828bc02f556bd0bf1724532aac36
author Glenn Kasten <gkasten@google.com> 1458349921 -0700
committer Glenn Kasten <gkasten@google.com> 1458349993 -0700

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

Change-Id: I1038e5f4571edd676e6e6b9cde014176b7df105f