tree e7cd04042f2d684b1afd7b02030527ac2d057834
parent 5dc0f5db7152a604377af30f7d2139a84fd7b30c
parent 67d5358e2a870f9e9447517bfa49bf5c6b410a50
author The Android Open Source Project <initial-contribution@android.com> 1275491673 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1275491673 -0700

merge from open-source master

Change-Id: I99ae03ba51ee185b9cfecf4f26e94a757f3815c2