| commit | 66b4b433012c6c1a9fc9cd07e8210e449bd683cd | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Dec 20 21:11:15 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 20 21:11:15 2013 +0000 |
| tree | 381e266c2550986a006e2d078af9f94dccf84441 | |
| parent | f9ad70a472bfab4d3769cb6eece06dac8de9e3bd [diff] | |
| parent | 224c60c337490e095d402e63961bdc8ae9ebd70c [diff] |
am 224c60c3: am da5d54c8: am dfabbc68: Merge "Add policy for x86 emulator." * commit '224c60c337490e095d402e63961bdc8ae9ebd70c': Add policy for x86 emulator.