tree e9fd7d7fe19b916f767dfbed9eb8dd24ec3a875f
parent 25ffaff6b1eb8706a893cf255db123d0644b4a7d
parent 28a8dab590a5f2e3db4489e162858f386fbcb9e8
author The Android Open Source Project <initial-contribution@android.com> 1273681974 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1273681974 -0700

merge from open-source master

Change-Id: I8e7903bcd3fe7ddf88b63462dc9123f12b779c64