tree 8df8c4853c447283df0a6781c0e01112addafa67
parent 845097c460f780f65c63b4e3e5ec3de03f23bc66
parent ac1571fdc91e2e215e86c4069e328d3294682e23
author The Android Open Source Project <initial-contribution@android.com> 1278698466 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1278698470 -0700

merge from open-source master

Change-Id: Iea0b0b45f13a3f1d045ed36d475dba5bbed71874