OSDN Git Service

Merge changes from topic 'smooth_unlock' into nyc-mr1-dev
authorAdrian Roos <roosa@google.com>
Fri, 5 Aug 2016 18:46:23 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:46:23 +0000 (18:46 +0000)
am: c49dfaf4d6

Change-Id: I7685cacba8cbe6b7e3d42485e0e9b32d9984651b


Trivial merge