| commit | 77917a835f5ca315da544a49e533f3cc5575d05d | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Aug 23 15:42:01 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 23 15:42:03 2016 +0000 |
| tree | 547a1d4252a35dda1bbca7574720d92a1e82decd | |
| parent | c069ed7f8c3d307c9fed2c8d1a81e28152190b5a [diff] | |
| parent | eee3518d11dced613c6578d2df9be000a1faab1e [diff] |
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev