| commit | 61d13ba4252ebaefbb446357ad876389a9128cd9 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 31 17:40:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:40:47 2014 +0000 |
| tree | fd262152ee4742bd2e9abfb0dc97c0ca0d6eac8d | |
| parent | 4ef8133a421dd92c6feb0508bc2274f12576cfd2 [diff] | |
| parent | 4fe702e4dcf5ff3e6dcc4dea1e842d7977ff3393 [diff] |
am 4fe702e4: am dfa2f8a6: Merge "Mark qemu_device as a mlstrustedobject." * commit '4fe702e4dcf5ff3e6dcc4dea1e842d7977ff3393': Mark qemu_device as a mlstrustedobject.