tree f2a9ca34e2b784500f4fee9e19c25592a782dd19
parent 99e087bc82c11d5909785acc7333176952a14032
parent 048683ea7e2d21dc681917d1b0eab7a24df79eaf
author The Android Open Source Project <initial-contribution@android.com> 1268097383 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1268097383 -0800

merge from open-source master

Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333