commit | 9ed77afe2c25f9ee1cb31e30914201fcc6e180ec | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Sat Jan 29 08:03:16 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 08:03:16 2011 -0800 |
tree | e76a91cf14e733fc2e4400d5af2de5204a930bfd | |
parent | f8faaaf16c5ea8a24ab6a283ec475cb09b91f398 [diff] | |
parent | b35e113cef040b9e8c8907341a2f94e420f7d108 [diff] |
am b35e113c: (-s ours) am 2d81c413: am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge" * commit 'b35e113cef040b9e8c8907341a2f94e420f7d108': Delete browserplugin sample. do not merge