| commit | c04271b7e86f5cb0bf084f4fb456c5aa580398a4 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Mon Aug 03 12:15:29 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 03 12:15:29 2009 -0700 |
| tree | 0c20aef8c6745c5da770989598caf95e87e6fd28 | |
| parent | fcc638dbba28f1804fb0f83b6f6964f8a408e4c9 [diff] | |
| parent | bf3e69efacadd9186604a53fee0e6734b1723bcd [diff] |
am bf3e69ef: (-s ours) DO NOT MERGE Fix the build, which has been also fixed separately in the master Merge commit 'bf3e69efacadd9186604a53fee0e6734b1723bcd' * commit 'bf3e69efacadd9186604a53fee0e6734b1723bcd': DO NOT MERGE