tree 42f578813ce5d2179c662cf89745d96e16d12e0b
parent 2a9ae01f74e7273ce0d1045754597ea78b88ba69
parent cf1250c149120eebb464d9e613272e0976ff9498
author The Android Open Source Project <initial-contribution@android.com> 1273698623 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1273698623 -0700

merge from open-source master

Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9