tree 5010524d08e16a0f1a9990c85ffdcf9c53a0b421
parent 802e057e6e55fc120cb6d344ca5e6a2690cff3f0
parent d095010b52282f41a483c7780815e0242f1e1629
author The Android Open Source Project <initial-contribution@android.com> 1278710468 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1278710479 -0700

merge from open-source master

Change-Id: If5c0de38e4b859b471abcecf16b5511c405bdcef