| commit | affee0eb10471d274e6ac7c393706f204945acb4 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Fri Apr 29 12:58:31 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 29 12:58:31 2011 -0700 |
| tree | b17fd26accabfcc8124c5a792b5096a9e27131b2 | |
| parent | b3d7785217d92b45038b2c8a3704cbbbe3971ab0 [diff] | |
| parent | 7db617efc079ccc1f384ef7939f7e8c444dfff7a [diff] |
am 7db617ef: resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp * commit '7db617efc079ccc1f384ef7939f7e8c444dfff7a': ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc