commit | 554c5946ce9fb273d4b95839fa1f04a680ff9034 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 31 00:41:00 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 31 00:41:04 2017 +0000 |
tree | 6f85397ea486989562e4b3694ce4139e5632471b | |
parent | 0ecd08bdd005591ef409ec65236e29db91cd0917 [diff] | |
parent | d0010c5ef12ccf0b5c20e7c12cf86def990b4feb [diff] |
Merge "Fix broken unit tests due to mockito upgrade." into oc-dev