tree 3cd9eaec63b9b8a779ac2862b393e77f1a2b0d8d
parent 7f2cc46a0fd89575324742d100ecfd178fd8ef74
parent ccc5b9bbd02ac3bca58e61295b1f3dd61edc0f72
author Yi Kong <yikong@google.com> 1493754565 -0700
committer Yi Kong <yikong@google.com> 1493754565 -0700

Resolve merge conflicts of ccc5b9bbd02a to oc-dev-plus-aosp

Test: Build
Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9