tree ea8394774dd2af9d10699c0198d5639d47f212a6
parent 6551036e84376acfe8fa0696678ce3b9dadff70a
parent 7a3262b94553d93289624ae8bb55ab67c8915969
author Scott Main <smain@google.com> 1297142229 -0800
committer Scott Main <smain@google.com> 1297142229 -0800

resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp

Change-Id: I2b2957346a99d5601005831a41033a355df5b163