tree cdfd2a3a8f6e07984db95aa3c61b3f6fe3f7dd0c
parent 3100d06aa6965f2eaa3f8f393817d0a4858c5329
author The Android Open Source Project <initial-contribution@android.com> 1229565850 -0800
committer Jaikumar Ganesh <jaikumar@google.com> 1287604489 -0700

Code drop from //branches/cupcake/...@124589

Change-Id: I28d6daea783c62ef14105593ffc3a0ca6a584339