tree 6171940a245eb5f0d2594268f9d84475fa255cda
parent d1078ec683900fee0dd1097e50a117031e555e7e
parent 7025964d1230e4fc064658e1911fea9aab3def68
author Yohei Yukawa <yukawa@google.com> 1449808985 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1449808985 +0000

Merge changes If80df0bc,I4e91b2d7,If3aef820

* changes:
  Apply Java 7 diamond operator.
  Remove a redundant method overload.
  Remove unnecessary parameter that is always true.