commit | f88cea6ded2023bd7b3330640f28cc730599e934 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 14 16:11:42 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 16:11:42 2009 -0700 |
tree | 85fbf84faee0d164617d2eab10e2f9c805271cf0 | |
parent | 31f0fc22357707b7c71f2ca08878b6ce6ddde1cb [diff] | |
parent | 4011770f2d06fcb743abc91a01a531c7ae2d9175 [diff] |
am 4011770f: merge from open-source master Merge commit '4011770f2d06fcb743abc91a01a531c7ae2d9175' * commit '4011770f2d06fcb743abc91a01a531c7ae2d9175':