tree 06695220200d52675d7fdff9567607713af311a2
parent e070c1f27d3d42174f5c103e5e9af12abaaeef21
parent 864d49d8b79e7ec7a0e14f461b87666b2e91cdf2
author Igor Murashkin <iam@google.com> 1499452221 +0000
committer android-build-merger <android-build-merger@google.com> 1499452221 +0000

Merge changes from topic 'am-cfcc6c733d6941928d5ef4ce29009232' into oc-dr1-dev-plus-aosp
am: 864d49d8b7

Change-Id: Ib96cac0c629f88155dd192e52f04c87d041e7aa6