OSDN Git Service

Merge "Bug: 28875393 Bug: 28879732" into nyc-mr1-dev
authorWilliam Harmon <xlythe@google.com>
Tue, 7 Jun 2016 16:15:37 +0000 (16:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 7 Jun 2016 16:15:38 +0000 (16:15 +0000)

Trivial merge