tree 09112c43064342531c2d68cc88af1a63c2e35d79
parent 121d6447b523906e9ce57482b1d204df790d3557
parent 7828874761ce3ce2a382f6c1745bf3975527cd7b
author The Android Open Source Project <initial-contribution@android.com> 1273515305 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1273515305 -0700

merge from open-source master

Change-Id: I8fa5fe12f60d0de2a0f6e0f9c567104253bcbea3