| commit | 08b2c120acee7813aeedb4122b2bff3c1fe17398 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Tue Apr 14 14:05:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 14 14:05:29 2015 +0000 |
| tree | a0164b34e20a2d511117133ae837247dabbcf780 | |
| parent | 8bbd8f4d72593d02b778655f29ec73a1c68624d9 [diff] | |
| parent | 0fd7c1f268db5e7a40a2feddf88d7cdb4ea45c13 [diff] |
am 0fd7c1f2: Merge "Add NOTICE file for Mockito" * commit '0fd7c1f268db5e7a40a2feddf88d7cdb4ea45c13': Add NOTICE file for Mockito