OSDN Git Service

Merge "Adding the AOSP header." into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 2 May 2017 02:18:50 +0000 (02:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 May 2017 02:18:54 +0000 (02:18 +0000)

Trivial merge