| commit | 7405fcedadebe466bf30e75d25026a207c449b31 | [log] [tgz] |
|---|---|---|
| author | Raluca Sauciuc <ralucas@google.com> | Sun Mar 08 00:07:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Mar 08 00:07:44 2015 +0000 |
| tree | ec4c6cc093f112119333b6c9a0cd9e031daa532c | |
| parent | a742a0497efe53740c37ddd0ab31bfd524e17bff [diff] | |
| parent | 803357dff58a66fd34f3dfec2fee2ad12bef5921 [diff] |
am 803357df: resolved conflicts for merge of cd1e170b to stage-aosp-master * commit '803357dff58a66fd34f3dfec2fee2ad12bef5921': Update prebuilts with Jacoco 0.7.4.201502262128.