tree 4fbf08aa8e3a3d4a15b3b3490140031b5b0638e7
parent 8a532cf2576bddfc52e959f14f61ab50825faeeb
parent 51ccc24d57b966de22d54bd83e21fdd137bbba4d
author Yi Kong <yikong@google.com> 1493755221 +0000
committer android-build-merger <android-build-merger@google.com> 1493755221 +0000

Merge "Resolve merge conflicts of ccc5b9bbd02a to oc-dev-plus-aosp" into oc-dev-plus-aosp
am: 51ccc24d57

Change-Id: Ib6109c22c278ce00ad1a0c6d3d1e6a7903cfad2f