tree 7b626fc77067b2ea426aa51dd929886887977206
parent 2d75ee4ad0034d81350602567b8d76b1278e7edc
parent 58ff1585cd15170bab04cae03c611d47096a5a0c
author The Android Open Source Project <initial-contribution@android.com> 1275489947 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1275489947 -0700

merge from open-source master

Change-Id: If51f538438a5da22d4f04cb6d251603b4abd08f0