OSDN Git Service

Merge "Fix boot loop issue on Android Wear." into oc-dev
authorSeigo Nonaka <nona@google.com>
Fri, 14 Apr 2017 22:20:35 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 22:20:35 +0000 (22:20 +0000)
am: 5f9fde884b

Change-Id: Ie73c0cfd4c348d1217338bb40694f20559702bcb


Trivial merge