| commit | d9dbe5fc77e314b0d0e165ed8237e3ab988024ee | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Mon Jun 14 21:52:50 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 14 21:52:50 2010 -0700 |
| tree | 6710c176dbfa532271b972b5311159d2fc5f1283 | |
| parent | 155a8b553671527b7e11a8fca9097e3e4669f6a2 [diff] | |
| parent | 08b36a55933847fd29aa7532c4617ab52f2d1273 [diff] |
am a34eaa0b: Fix merge from Gingerbread which broke the build. Merge commit 'a34eaa0bf798bd8816c4a4d946e4e4878cc46abd' into dalvik-dev * commit 'a34eaa0bf798bd8816c4a4d946e4e4878cc46abd': Fix merge from Gingerbread which broke the build.