commit | b1110149cccc3b99e59ead34ca46e5ac026f6db9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu May 13 14:50:16 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu May 13 14:50:16 2010 -0700 |
tree | 53f282b539ba34e787cc11eeab7b7b829c0145a5 | |
parent | a3d5549c802bc4fbf1e1ca05bc3552db17212036 [diff] | |
parent | b79781af1ebc68dbaa1b44da43fd391de067a201 [diff] |
merge from open-source master Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8