| commit | 7fe44cbc2b2766accb30ee5de27bf14d8902d0ec | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <robdroid@android.com> | Fri Aug 27 09:24:29 2010 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Fri Aug 27 11:05:11 2010 -0700 |
| tree | 34483c81f099aa74e8073b2e40943517036272f1 | |
| parent | 46403bf739507e1dead15bc87147a62512ba6a2c [diff] |
resolved conflicts for merge of 4ea54f44 to master Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56