| commit | a30ed30b756136e253fd797b6eaf83205c413e15 | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Fri Jul 29 14:16:18 2011 -0400 |
| committer | Derek Sollenberger <djsollen@google.com> | Fri Jul 29 14:16:18 2011 -0400 |
| tree | 3e55091b1bef74317d7f52f08ac825486fd33ec7 | |
| parent | 86574d66dacc09c9b5a0a0ab2623ec01704b6fc8 [diff] | |
| parent | b7f09f28b92927ad5eb46f86e11a8a3df33ec914 [diff] |
resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6