tree f91b0dbc659dd34235f0a42a6743bb552d800c3f
parent 3b9ec9bb3cf508319a5e01815b37e97817eba92e
parent 5d6ef9767220a4f2cd4a9a62fb79c287725bc0f5
author David Turner <digit@google.com> 1466675462 +0000
committer android-build-merger <android-build-merger@google.com> 1466675462 +0000

resolve merge conflicts of d027477 to nyc-mr1-dev-plus-aosp
am: 5d6ef97672

Change-Id: Id8844f27c56acd111a975d7a74153b5289281bb8