tree e45bf40318808b7ce83e3536c7e351d1021dc635
parent 091e23fb0c93886b83335fac9596330a4ae06804
parent 456a25e50b2fa4c85f14b74801edf6d84b650b20
author Xin Li <delphij@google.com> 1510353564 -0800
committer Xin Li <delphij@google.com> 1510353564 -0800

Merge commit '456a25e50b2fa4c85f14b74801edf6d84b650b20' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: I55c4a4a736e1cdbfd579bd0529ed8d8966eb9e2a