tree c1e7103b59af5d74eb576ebab7b14d34be5c0e53
parent ae3269accdb31d47d9b544ff7e2cba6cc20576c3
parent ab380fd77d4872d94cda212e91cdf9a847d99bf9
author Alain Vongsouvanh <alainv@google.com> 1465401406 +0000
committer android-build-merger <android-build-merger@google.com> 1465401406 +0000

Merge \"resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3\" into nyc-mr1-dev-plus-aosp
am: ab380fd77d

Change-Id: I7c96593906f26e71eae8760e3f474ac2e8115f38