tree 92552994f19af583c7438f245f3ac39f1c1ed618
parent 8ac50107a21b96f6e9c77ab23820d164543c5bbe
parent 705c944c0e2a50150ffb41707b6b3daebb45cf79
author The Android Open Source Project <initial-contribution@android.com> 1271773703 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1271773703 -0700

merge from open-source master

Change-Id: Ib9250bd9d73664b07facaef362beba57a1519411