tree e7f86e2e969d3c1de73c3ed4a743bfb75e08f569
parent 49ef1342c15cc501d340ebbbc52d5b0763ce3761
parent 2bf95acf7a540ba5d521b48baf520c3354ae32e1
author Elliott Hughes <enh@google.com> 1460506540 -0700
committer Elliott Hughes <enh@google.com> 1460506540 -0700

resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp

Change-Id: Iaf232fbe65879bad6e19c7a9600aa6303a491a67