OSDN Git Service

Merge "Only onboard when launched through front door. am: 2d6d4d23a9 am: c34270d03d...
authorJeff Sharkey <jsharkey@android.com>
Wed, 21 Jun 2017 17:59:49 +0000 (17:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jun 2017 17:59:49 +0000 (17:59 +0000)
am: 2e781bb778

Change-Id: Ifd6e99383dbd5a528e9f402a8d3abf1d8d054636


Trivial merge