commit | 9a5c6e4f56e574e7591d8d3af1c2b64053df407f | [log] [tgz] |
---|---|---|
author | Romain Guy <romainguy@google.com> | Thu Aug 19 15:18:34 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 19 15:18:34 2010 -0700 |
tree | a2330119a5a1abc46d2970e310a1f2cc6df2c9c8 | |
parent | d88e0680edd88e10870d5f6f303633cea839d686 [diff] | |
parent | 18ef37258d897928c68b89535a93b99d8a817d3c [diff] |
am 18ef3725: DO NOT MERGE. Fix the build. Merge commit '18ef37258d897928c68b89535a93b99d8a817d3c' into gingerbread-plus-aosp * commit '18ef37258d897928c68b89535a93b99d8a817d3c': DO NOT MERGE. Fix the build.