commit | 2b5079353b57615e8ec9826a685453174d9c0f36 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 30 15:53:54 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 30 15:53:54 2010 -0700 |
tree | 3f1464cbdb58e866d03911708cea47542b213106 | |
parent | 6f88d2b974eb0fef48cc4cb7f236dd2b9f449780 [diff] | |
parent | dcd11407e242e8e50d122752a5df769450ab6d8d [diff] |
merge from open-source master - DO NOT MERGE Change-Id: I52a12f84d69726d353c87c1b150af205ba22f460