tree 6ad0ad09316ec24158a0a829507d6b9ce70b7534
parent 8aeb7cc4614147adaa70a9c270c68737afb4c3f7
parent 7ef314546ba57a371c7d78f95845322bccfa0786
author The Android Open Source Project <initial-contribution@android.com> 1276793902 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1276793916 -0700

merge from open-source master

Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823