tree 9e0014a88414d3d1364930a8cfa6abd123183cc3
parent 02e18d4d4eed949da02fd8aa87801858d99b902a
parent 9d3fa5764cb58dd8be7eae349f8ee3307e74ff8c
author Jean-Baptiste Queru <jbq@google.com> 1282754328 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1282754459 -0700

reconcile open-source froyo into google variant

Change-Id: Idfacbf98a6c98176620f252504213d01bbd49eb9