tree 8352fbe189680c27296317f2dada77cb7863a879
parent 5f5ae71ed6fc176add4c3bfe2df7538d24494794
parent ed9483ac353bf127889707abf2656acc04483952
author The Android Open Source Project <initial-contribution@android.com> 1273873445 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1273873445 -0700

merge from open-source master

Change-Id: I67c1f9768f55f7cc19e47b0febeca59bc9afed08