| commit | 5637884f8217dbf28de0913c06aceaf09c898510 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri May 13 19:48:11 2011 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Fri May 13 19:48:11 2011 -0700 |
| tree | 48564b01ad7a5456a2ac4d937945b0ba3fbe8bfa | |
| parent | aaa0003924a16a06eb871456c33364461c25a834 [diff] | |
| parent | 1e8d508f2d97e19f2fc8a709330ea97e1e9f203a [diff] |
resolved conflicts for merge of 1e8d508f to dalvik-dev Change-Id: Id0739d4e567b112cbea48f5ecb7dd46425da1a36