tree d6cc98660c0aa74a05f00c2a84a3566407ff5f40
parent fe75781ee9b51bc1266f5e9d002637c53cd3c92c
parent 833e62400e7ecfea3df188b99b6639708fe36963
author The Android Open Source Project <initial-contribution@android.com> 1277746550 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1277746550 -0700

merge from open-source master

Change-Id: I90d465b0197034dab76505b8a68afc519be3e6e0