tree d00a5bbb30514f9ad36d2f6fb0a4c4daa287cb29
parent aef3a49f098a3295e7cbf81d5cf62703a7b047f1
parent 5131171a2eaafcd9de3ad4f8fdbabf5dc34f9304
author Ian Pedowitz <ijpedowitz@google.com> 1465234496 +0000
committer android-build-merger <android-build-merger@google.com> 1465234496 +0000

Merge "resolve merge conflicts of a87e5f8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am: 5131171a2e

* commit '5131171a2eaafcd9de3ad4f8fdbabf5dc34f9304':

Change-Id: I34b6306572d034224f669963c3ffead1fe4ba18b