tree 3a1717f2dd81dec6e2c8da2002aee6f54b794298
parent ff14143cee60a38b17c2610807a0503ba86d0bb2
parent dfe0647f6c7a80242f1646541a6f3460e0ef3c76
author TreeHugger Robot <treehugger-gerrit@google.com> 1487885075 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487885079 +0000

Merge "Fix unit test that failed due to incorrect refactor."