OSDN Git Service

Merge "String tweak "upgrading" to "finishing"." into nyc-mr1-dev
authorJeff Sharkey <jsharkey@google.com>
Fri, 29 Jul 2016 22:55:12 +0000 (22:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 29 Jul 2016 22:55:14 +0000 (22:55 +0000)

Trivial merge