| commit | eb1c59e8ea4ff2c9d13c902d400276fdd319757a | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Tue Jan 25 16:22:03 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 16:22:03 2011 -0800 |
| tree | acba5f60cce6a25d14338f5b7103821f592d65ab | |
| parent | 10c2760f5b53f50c444b55bbd415ba0839d7b1a5 [diff] | |
| parent | 504097e6229322171f51046585f1f298acdb6668 [diff] |
am a1bed9d1: (-s ours) am af4fa5d8: (-s ours) am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread * commit 'a1bed9d179c86f89b29f891ecd53da21c4e5a13f': partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)