tree 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent 645ab2efb0fbcda71f262872c47b7381e21bc332
parent ff796e109ffbf427ffa45511c247a96faacb703c
author The Android Open Source Project <initial-contribution@android.com> 1274206092 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1274206092 -0700

merge from open-source master

Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0