| commit | 10730c6901767b0304d8be470bbd7a60c5c87a02 | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:35:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:35:58 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | d25ed735e2b6ee6b88ee2ba5ceb894f021402d5c [diff] | |
| parent | 39c205605a1247675e7a50eea27f8d4a1e7fd51b [diff] |
am 39c20560: am 6b779696: (-s ours) am 8bbca1fd: am 2548aaca: Merge "Fix ProcessRecorder & RecordingBuildListenerTest." into studio-1.4-dev automerge: a2daa72 automerge: 155b628 * commit '39c205605a1247675e7a50eea27f8d4a1e7fd51b':