| commit | 4fe702e4dcf5ff3e6dcc4dea1e842d7977ff3393 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 31 17:36:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:36:28 2014 +0000 |
| tree | 574840f542b541fac278a548a6c083c5d15176ba | |
| parent | 7f18adc240ca311d225ee9164e6d982f9a005d62 [diff] | |
| parent | dfa2f8a6e309bca516a11d83abd1aa8733acce69 [diff] |
am dfa2f8a6: Merge "Mark qemu_device as a mlstrustedobject." * commit 'dfa2f8a6e309bca516a11d83abd1aa8733acce69': Mark qemu_device as a mlstrustedobject.