tree 0d012d23687824a0f5a99d1e3ec886957e703073
parent 6d77a81456610b6720482459596c3af58058d8b9
parent 35765066b921a5bce26e3799b9e20c661771adfc
author Jean-Baptiste Queru <jbq@google.com> 1323189308 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1323189308 -0800

Merge 35765066 from ics-mr1-plus-aosp

Change-Id: Ibaeb49dc20f3c736417d5cb68769e7b501a61632