Merge "Add the error code "OPERATION_NOT_ALLOWED" and log the error."
authoryinxu <yinxu@google.com>
Thu, 10 Aug 2017 19:51:36 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 19:51:36 +0000 (19:51 +0000)
am: fe9cb04ec1

Change-Id: If1c8a16729f9d405ea0507a8a9ec2f5e4a5237d1


Trivial merge