| commit | beb66d696e855174ec8454ae640a7e20fc49e325 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Jun 10 23:29:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 10 23:29:12 2014 +0000 |
| tree | c1e853993d242833acbc990a2b0d0f5ddb3b8547 | |
| parent | b116db59e312c46134459ebb54a7f121d2934999 [diff] | |
| parent | aa4e4d8463750a27f391c0381184b01c4b52b7aa [diff] |
am aa4e4d84: Merge "Fix for test-art-host" * commit 'aa4e4d8463750a27f391c0381184b01c4b52b7aa': Fix for test-art-host