tree 4c26502301f1318ce26c186faf4857143b76e094
parent b0d0e260bd6118959fa0e2d3c84037b3e0178551
parent b013bfc17110787f4a735552f7e0c03261a3f2b5
author David 'Digit' Turner <digit@google.com> 1304076691 +0200
committer David 'Digit' Turner <digit@google.com> 1304076691 +0200

resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp

Change-Id: I159dd58c403bc38f9637163d8cd5e6270e4f201c