commit | 3436eb3480e93eaa0a08d1e497f9046fcd43d0a8 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 26 10:13:02 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 26 10:13:02 2010 -0700 |
tree | 546838dfcaa29f8196c7845537ed4cd312f85cf6 | |
parent | a7137538c2b3f7e933f9a808158ff63238172c22 [diff] | |
parent | 14d9c34ccb75795d0b219b3dcc42c2269eb0e756 [diff] |
am 14d9c34c: am c7ab09ed: Merge "Fix build." Merge commit '14d9c34ccb75795d0b219b3dcc42c2269eb0e756' * commit '14d9c34ccb75795d0b219b3dcc42c2269eb0e756': Fix build.