OSDN Git Service

Merge "Fix crash when docking." into nyc-dev
authorRob Carr <racarr@google.com>
Wed, 27 Apr 2016 21:36:50 +0000 (21:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Apr 2016 21:36:53 +0000 (21:36 +0000)

Trivial merge