tree ea9b35882420896cfba281f17293bce74e564089
parent a125c937de06b1cc43368743592f47513eb88b76
parent ea9e6d24a458c06df6237fddd22b6165b2f92cb5
author Xavier Ducrohet <xav@android.com> 1311209111 -0700
committer Xavier Ducrohet <xav@android.com> 1311209111 -0700

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

Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602