OSDN Git Service

Merge "Work around issue #65333586: Took phone out of pocket..." into oc-mr1-dev
authorDianne Hackborn <hackbod@google.com>
Mon, 11 Sep 2017 14:50:53 +0000 (14:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 14:50:53 +0000 (14:50 +0000)
am: f04b643ca8

Change-Id: Ib788a6ced4e7463f2696ac31362274f88192793d


Trivial merge