| commit | bbf9d73a5677de73eaa3b4e1f6de94a24697aad1 | [log] [tgz] |
|---|---|---|
| author | Dan Bornstein <danfuzz@android.com> | Wed Sep 15 13:13:33 2010 -0700 |
| committer | Dan Bornstein <danfuzz@android.com> | Wed Sep 15 13:13:33 2010 -0700 |
| tree | 0d8a331b9941fd10dc618eace19a8b6207d648dc | |
| parent | 5170ba5e38ff9e1410fcbb65dc67ea6a6d5b4b17 [diff] | |
| parent | a5d998926bdc642ceef18959372fa08791a22c08 [diff] |
resolved conflicts for merge of a5d99892 to dalvik-dev Change-Id: I3c030a6b19416a2ac3ca709cdbcbc6b41e6379d3