Merge "Fix java build warnings, mostly unused imports."
authorMika Isojärvi <misojarvi@google.com>
Thu, 19 Mar 2015 20:39:14 +0000 (20:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 19 Mar 2015 20:39:15 +0000 (20:39 +0000)

Trivial merge