OSDN Git Service

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 18:19:45 +0000 (18:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Jul 2017 18:19:45 +0000 (18:19 +0000)

Trivial merge