commit | fb234bbe5e7cbae42b4fc8f4ab353ba561599db2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 11:58:14 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 11:58:14 2010 -0700 |
tree | c5bd66bef1f7290ed41589b86cfb3cb8cca5efb5 | |
parent | 68b37d14708414d3cee418024c178f0a3c7d8b5b [diff] | |
parent | ef2cf71420550fb45f89e67c56f338031f0adb63 [diff] |
merge from open-source master Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c