| commit | 0d03a24ea9a2ec0556ccfdb79f6e123d703509aa | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Jun 11 20:49:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 11 20:49:36 2014 +0000 |
| tree | a0f4a9feca84c0bfa9c2f6131fe57526a11f33b1 | |
| parent | f7e0ae8c239172cd4990d3568034ee5d640629db [diff] | |
| parent | beb66d696e855174ec8454ae640a7e20fc49e325 [diff] |
am beb66d69: am aa4e4d84: Merge "Fix for test-art-host" * commit 'beb66d696e855174ec8454ae640a7e20fc49e325': Fix for test-art-host