tree 2f3a396e3dcec7e2c3e33fbf155bbcfabc810bcd
parent a31688b8cbff2a212b6d4620872dbbc0cde3fd69
parent 35276a6696fb25adb613411b0f5b5d4b6869ab05
author Chen Xu <fionaxu@google.com> 1498159399 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498159411 +0000

Merge "resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp