commit | db4c5f352d6eb8e248953ccff1dbecb1270af4c5 | [log] [tgz] |
---|---|---|
author | David 'Digit' Turner <digit@google.com> | Tue Jul 12 00:57:09 2011 +0200 |
committer | David 'Digit' Turner <digit@google.com> | Tue Jul 12 00:57:09 2011 +0200 |
tree | dbf3d0a59faa85e8199db5b0457902875bd0fd82 | |
parent | 7022db4cd2ca3721631595d7379eabb2cc77f6a9 [diff] | |
parent | 7816eded417357561496df19dfa711be5586f3b0 [diff] |
resolved conflicts for merge of 7816eded to gingerbread-plus-aosp Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa