| commit | f27b62fb901086536561e152b68f73c46d6300af | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Wed May 18 09:25:49 2011 -0400 |
| committer | Mike Lockwood <lockwood@android.com> | Wed May 18 09:25:49 2011 -0400 |
| tree | cbd620814078e72be1d911c01f36231f6b09c6a9 | |
| parent | 24139dd2b0b7475419a380a142cd9c749dd74970 [diff] | |
| parent | aace777cd5e007fa175a847f0255665b6193ece2 [diff] |
resolved conflicts for merge of 22c140b7 to master Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302