commit | 595d6f085b01ace24f06595a10107d222de07cf1 | [log] [tgz] |
---|---|---|
author | Romain Guy <romainguy@google.com> | Fri Mar 18 16:56:49 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 18 16:56:49 2011 -0700 |
tree | 24ea076c265490388e2a6b6202d94e465ca6d517 | |
parent | c66f8c1880d1ae18f8c09822b21e4bc42590c156 [diff] | |
parent | bc411cdd0233914f5fbab34e8e43fd98732f416b [diff] |
am bc411cdd: Merge 520c90cc from master. do not merge. * commit 'bc411cdd0233914f5fbab34e8e43fd98732f416b': Merge 520c90cc from master. do not merge.