commit | d398e7a4932acbc317483fdfdf362838c5a3b52a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 18 11:36:35 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 18 11:36:35 2010 -0700 |
tree | fec5849cb7d7d03751602211254c47bb94188e1d | |
parent | 6be61854b10d0b47920a7d99ff8e94560dec3734 [diff] | |
parent | 893e2b626f36bcc76cafd0848640ad83487c4a43 [diff] |
merge from open-source master Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8