| commit | ddb12686710c8efa8726d94bd8b417eb2e59a9f5 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Aug 21 22:18:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 22:18:08 2014 +0000 |
| tree | 69a45961f1d0bec484fc136132130ba9d594db18 | |
| parent | ab25164792e4d2ae017b0c7745ff4422300af555 [diff] | |
| parent | e22d6a23e9b0f1374ad42118e5f5b2360d891c0f [diff] |
am e22d6a23: am 9d8a78c5: am 260be3ac: Merge "Disable MagicSmoke as it depends on hidden APIs." into lmp-dev * commit 'e22d6a23e9b0f1374ad42118e5f5b2360d891c0f': Disable MagicSmoke as it depends on hidden APIs.