OSDN Git Service

Merge "Revert choose lock header file to non-setup theme" into oc-dev
authorMaurice Lam <yukl@google.com>
Wed, 29 Mar 2017 15:45:21 +0000 (15:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Mar 2017 15:45:22 +0000 (15:45 +0000)

Trivial merge