tree 14a4b13c7cfcfc1d9961a002539add0f67c5d3bc
parent 0430aa5b723f5a536437b97b4227180d50004df3
parent bd76bb0aa8c8e38081ae1f97aee1fa85c731dfb6
author Elliott Hughes <enh@google.com> 1473464375 +0000
committer android-build-merger <android-build-merger@google.com> 1473464375 +0000

resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aosp
am: bd76bb0aa8

Change-Id: Iff135a00681ab237d81726f884ec6ba007703c9e