OSDN Git Service

Merge "Default-off FP Swipe am: 8f5de15ba1 am: e4fed2ee05" into oc-mr1-dev-plus-aosp
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 25 Jul 2017 01:11:02 +0000 (01:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 25 Jul 2017 01:11:02 +0000 (01:11 +0000)

Trivial merge