tree c687be5642e280cefa6f358680b4ce5d965a144a
parent 85a89c64b45e6b53eab3ccf651d339661e13d6ba
parent 9b9e7485747fe60b315aacb05c0c61b802cbc7c6
author Xin Li <delphij@google.com> 1509649236 -0700
committer Xin Li <delphij@google.com> 1510187065 -0800

Merge commit '9b9e7485747fe60b315aacb05c0c61b802cbc7c6' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I2a84192e94ca0eb7ec2e54d059581cac4c103a25
Merged-In: Ia8e8194028825190addbe3b2c33da2a54d83d6fc