| commit | 8ecc24b7732428f2424b954d95cd9377fbdf80e3 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Sep 06 12:06:00 2011 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Tue Sep 06 12:06:00 2011 -0700 |
| tree | 2b2a5240e0952e74498cf79e5d7274810beed6bd | |
| parent | 1e307dfd0eeca73d4cde1f55e91ee216f4a07eee [diff] | |
| parent | d3cb3af5d0fdf6c1dc7c3c2c248261ff46c61219 [diff] |
resolved conflicts for merge of d3cb3af5 to gingerbread-plus-aosp Change-Id: I8cfc745b1028209c6d4888156420682d042aacd8