tree 1dc2402b89bac85ebec30fcd731e814bc0541a16
parent 0f6014e112e6a671443ce0230b0bc93bddc01839
parent ead651e2a5fd49fa6ea9af5248596b125bd63fee
author Chenbo Feng <fengc@google.com> 1500408766 +0000
committer android-build-merger <android-build-merger@google.com> 1500408766 +0000

Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d  -s ours am: 86df9aa8f2  -s ours
am: ead651e2a5

Change-Id: I6393a50d98affc5b84befd19aa4312abf4604b3e