| commit | 23bc498db86d02ec8fa87c6e5a7d0ec8dd2559a0 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Mon Jul 14 19:22:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 19:22:37 2014 +0000 |
| tree | 7369d1deb42107decc58c177821939f24a884268 | |
| parent | e7c2a208731ced1661bc02bccdec4889f19dd2cb [diff] | |
| parent | 7b1f6d6e393d49a8cef40fc53f662de7e0bd6065 [diff] |
am 7b1f6d6e: am 9e5599d9: am a76dc41f: Merge "Allow method tracing for run-test" * commit '7b1f6d6e393d49a8cef40fc53f662de7e0bd6065':