tree 35a1183dd11612f8dac5e5d41e709586a4016d04
parent 10b3b9bb7347011108b6daf482d4842144487245
parent 1bce83e78f16456d0f187b5d5e6c8957e93f059a
author Dimitry Ivanov <dimitry@google.com> 1470890086 +0000
committer android-build-merger <android-build-merger@google.com> 1470890086 +0000

resolve merge conflicts of 03ea02c to nyc-mr1-dev-plus-aosp
am: 1bce83e78f

Change-Id: Icd485ea056fe2ea0cb5e6c7ea75453522b5ca903