commit | 8b966340acfe55ad83b7c3c38a378d0b5ad8fa9b | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 14 16:11:31 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 16:11:31 2009 -0700 |
tree | 6c463580fbac9017f7e5e48829f8fbee20c15446 | |
parent | c724276197cd4d263e9e28cb9da5411164bb6b5c [diff] | |
parent | 2fc16d46cef711a6e8e1cd888444a079e14c2cde [diff] |
am 2fc16d46: merge from open-source master Merge commit '2fc16d46cef711a6e8e1cd888444a079e14c2cde' * commit '2fc16d46cef711a6e8e1cd888444a079e14c2cde':