tree bfe9bb3c72f210683dca310e124a3198c2b42236
parent 3de63b416d80b1d50c6087336d0a34b2ffbe8528
parent b7ea5aca58a1313e6d377436575fc97f91c01005
author Jean-Baptiste Queru <jbq@google.com> 1296065289 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296065289 -0800

Merge b7ea5aca to honeycomb-plus-aosp

Change-Id: I21074a6291cd8987f7e247c181fd02f8ad0f50d0