Reconcile with AOSP master

Change-Id: I12bbc98729a54df0e3d355f3bb2b943964202235
This commit is contained in:
Jean-Baptiste Queru 2011-10-28 08:37:25 -07:00
commit 604f52e313

Diff content is not available