tree e31816e7cd323c8529377c0b66f61902f71cffa4
parent 0659dd5625cb6abf09ac756eab92923b1002138a
parent 7c84efe083f4cd6b4a322bfe018f26b2f7d1e844
author Jean-Baptiste Queru <jbq@google.com> 1276125992 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1276125992 -0700

merge from froyo-plus-aosp

Change-Id: I82ec6dbd7c8c3b37b9505eaef351042f2ee53fb5