tree 2a1518fa4275e126a96e13792bc46b1b85a21a3d
parent 4acde5dcafa1b7c7fa241081c9b49f0bbf436c23
parent 734756ca3968b54e32acab867a05b10fc5e13d07
author The Android Open Source Project <initial-contribution@android.com> 1273786331 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1273786331 -0700

merge from open-source master

Change-Id: Id96727850237dd454ca30090a27b67ba4f75f881