tree b4ff3092b24ed3802319c665028a5638fb92447a
parent 5f9aa93881e796a66c2a625ced1ee89292c2b570
author Andy McFadden <fadden@android.com> 1245799665 -0700
committer Andy McFadden <fadden@android.com> 1245799665 -0700

Merge 137552-p9 to donut.

Since we're apparently using these calls now, we probably ought to pull
the bug fix over.  It's been in master for more than 3 months so it
should be safe.  It'll also make future merges easier.

Prequel to fix for internal bug #1926596.