| commit | 4d95e43155e0bbbc9b011f146e1b151c74470739 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Dec 20 22:51:33 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 20 22:51:33 2013 +0000 |
| tree | 9cf8db3130cc2aa997512941b7040bb1fbf5bfb8 | |
| parent | e206e511e66b30aefc43aea74480afb0ce4407aa [diff] | |
| parent | 66b4b433012c6c1a9fc9cd07e8210e449bd683cd [diff] |
am 66b4b433: am 224c60c3: am da5d54c8: am dfabbc68: Merge "Add policy for x86 emulator." * commit '66b4b433012c6c1a9fc9cd07e8210e449bd683cd': Add policy for x86 emulator.