OSDN Git Service

Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
authorAjay Kumar Nadathur Sreenivasan <ajayns@google.com>
Fri, 7 Jul 2017 21:33:47 +0000 (21:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 21:33:47 +0000 (21:33 +0000)
am: 56787e3e54

Change-Id: Ic30a63d3043a04aeeac04d65a747897b91e1831b


Trivial merge