tree 146303bbe2e1c6e5738de9ad774c2a240e185cae
parent 0f82b371498995d24aa4cf8c577e6535b81ddd7a
parent 2578a5ce691aece367ce2759e2ea4f54dc7695a0
author Xin Li <delphij@google.com> 1510085309 +0000
committer android-build-merger <android-build-merger@google.com> 1510085309 +0000

Merge commit '6e6df26ed3086f6e208abfcd2bba5242f67ac78a' from oc-mr1-dev-plus-aosp into stage-aosp-master. am: 83bf281120
am: 2578a5ce69

Change-Id: I8b27b9cd21fa86d44bfe70fb4df8fa8c91e2a3b7