commit | 7619bd8d1434a08e5debcd278a549dba4250a842 | [log] [tgz] |
---|---|---|
author | Brian Muramatsu <btmura@google.com> | Thu Apr 07 11:46:59 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 07 11:46:59 2011 -0700 |
tree | e852698e6864b2405bc8caf5903312f6ef7b3200 | |
parent | 8c20dd0348ee12809dfad611d2fe641abc95bd4e [diff] | |
parent | 7cf399e775a7d5bd28cbbef978ab0faa0b6e88b4 [diff] |
am 7cf399e7: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '7cf399e775a7d5bd28cbbef978ab0faa0b6e88b4': Fix WifiInfoTest Update NO_DELIVERY_REPORTS list. Update Expectations File Remove Test Annotation Related Tools Clean Up VideoViewTest CTS: Fixes a possible "out of memory" exception