commit | 8eb47bb13d031e0872cfd62a013bdca696e67237 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 04 11:06:01 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 11:06:01 2009 -0700 |
tree | c19b5d863646eb4d27863019edfd123d749e9d2f | |
parent | 451f14f769444c0124ae1acba0cfeeea7a7b8419 [diff] | |
parent | 6d547933b8aa3a811499708bc8a4fea551599359 [diff] |
am 6d547933: merge from open-source master Merge commit '6d547933b8aa3a811499708bc8a4fea551599359' * commit '6d547933b8aa3a811499708bc8a4fea551599359':