Merge "Remove unused variables."
authorMika Isojärvi <misojarvi@google.com>
Mon, 9 Mar 2015 18:05:21 +0000 (18:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 9 Mar 2015 18:05:22 +0000 (18:05 +0000)

Trivial merge