| commit | d8ad6c98086c410243e0e8ad8285f02d6b696bd6 | [log] [tgz] |
|---|---|---|
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | Mon Aug 08 14:47:04 2011 -0700 |
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | Mon Aug 08 14:47:04 2011 -0700 |
| tree | 69649409778f147c482a267dd51b48c9ffad6fd7 | |
| parent | 3c3569d30c274c5d5ff040d3379427cea3175d06 [diff] | |
| parent | 988d3d7181473e36df8679368b06d0fb766c52e4 [diff] |
resolved conflicts for merge of 988d3d71 to honeycomb-plus-aosp Change-Id: I85178afbca0b8b51eb3890958b063a70a1b33b96