| commit | ad3f0c17050decb6cdd451243ad569b71bc266de | [log] [tgz] |
|---|---|---|
| author | Fabrice Di Meglio <fdimeglio@google.com> | Thu Dec 05 22:41:32 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:41:32 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 55158d53a91aa5a5a0f0b0dc72692962aa1c3ca1 [diff] | |
| parent | 9fe98de0a9f21c0e190362c9c03563dfb241ba52 [diff] |
am 9fe98de0: (-s ours) am e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev * commit '9fe98de0a9f21c0e190362c9c03563dfb241ba52':