tree 854d45130cd66caa46b4e0876a2fb7dcb28f8b38
parent 5da23730aaf38750545db4781458f88a23eb9e84
parent 927a6a5cd2e68973cbca9a676a974aedb259f759
author Xin Li <delphij@google.com> 1511916192 -0800
committer Xin Li <delphij@google.com> 1512172953 -0800

Merge commit '927a6a5cd2e68973cbca9a676a974aedb259f759' from
oc-mr1-support-27.0-dev into stage-aosp-master.

Test: build
Bug: 69807424
Change-Id: I001577d47c11c7c622dfb04481928ee40beeb60f