OSDN Git Service

Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
authorAjay Kumar Nadathur Sreenivasan <ajayns@google.com>
Fri, 7 Jul 2017 17:40:32 +0000 (17:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 17:40:32 +0000 (17:40 +0000)
am: 9afa37ac3c

Change-Id: Ib1b02ae394631c28db7f2bdd5bbba5a19812182f


Trivial merge