tree 191104b8f7d19486b39bc16fdf98890679fbf435
parent 96f517ad51c3afe83f4d12e78beba1122f5dc877
parent f35a2ce023b55701ae9ffde56082faa91647e624
author The Android Open Source Project <initial-contribution@android.com> 1291170521 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1291170531 -0800

merge snapshot

Change-Id: I43b08cb4199e90b8132ef933145c1132284b214e