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)
commitd6e1be947e997c8df04a8a0ee7611f2aebaada5e
treeed9ba6a4f029792665b44644f3b9f12d5bfb73b2
parentcfa37bb121c7f3b4a9da1a5841612c0d502d3d71
parent9afa37ac3cb8958270d1142d638d872977668ae4
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
am: 9afa37ac3c

Change-Id: Ib1b02ae394631c28db7f2bdd5bbba5a19812182f