OSDN Git Service

Merge "Back-port fixes for b/62196835" into mnc-dev
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)

Trivial merge