tree ef7498af7bb8834542d3793089527a09aad0a635
parent bea2ba0753a80abf0c81a30aff82a701aed4ce9f
parent 48b40fefa1cd8b5371cb468dfcd79369a137566f
author The Android Open Source Project <initial-contribution@android.com> 1269468869 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1269468869 -0700

merge from open-source master

Change-Id: I53bb11e377bf04e9a0a75ce6bb0c1c4afe3faaeb