OSDN Git Service

Merge "fix the api style" into oc-dev am: befdb0ec8c
authorHendrik Wagenaar <hendrikw@google.com>
Thu, 30 Mar 2017 21:25:05 +0000 (21:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 21:25:05 +0000 (21:25 +0000)
commit016f5153d5ce1fdc5b0b79014267ecb981f5eb4e
treec8bb604586368ac23ea0b6d8451cfa284867fdf5
parentc68355566e1c35f38ea494ce59118940f246ecf0
parent982dd6af24b89608d5e9d45461970278cd9c4b93
Merge "fix the api style" into oc-dev am: befdb0ec8c
am: 982dd6af24  -s ours

Change-Id: I2e7ec05413b613e11536ce8f2fc7e083d58511c6