OSDN Git Service

Merge "Fix up inconsistent variable names." into nyc-mr1-dev
authorPaul Mclean <pmclean@google.com>
Thu, 2 Jun 2016 13:37:17 +0000 (13:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Jun 2016 13:37:18 +0000 (13:37 +0000)

Trivial merge