OSDN Git Service

Merge "Fix Companion UI crash on configuration change" into oc-dev am: c1e3ab359f
authorEugene Susla <eugenesusla@google.com>
Mon, 22 May 2017 23:18:00 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 May 2017 23:18:00 +0000 (23:18 +0000)
am: 7f0e3b5996

Change-Id: I033327cd9ff7c24aa6f6eeba07cd96af15227ae4


Trivial merge