commit | 900b6157f5dee2ed7b2c73cf320b2baf293230ff | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 15:04:52 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 15:04:52 2010 -0700 |
tree | 15fabaeae78d67b8ee40afa76c5fabff20582d2b | |
parent | fb580943133d3e9ad3e342b8038726b04686f283 [diff] | |
parent | 5b9fb5ab7ee81fc9b22f9aaea478db65e9b56c43 [diff] |
merge from open-source master Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd