am 21bfd26f: am 111f5e92: Merge remote branch \'goog/honeycomb-mr1\' into manualmerge
* commit '21bfd26fd69ac180ae35bf727dc8500fc56289ea':
Add test to ensure data/drm directory exists for drm process to write the certificate files. For bug 4950503.
Update Test Expectations for HC
Fix DeviceAdminReceiverTest NPE
Add a header for string.h for strerror and memset
Fix Screen Lock Test for HC
Update CTS Version to 3.0_r3
Fix webkit flakiness when waiting for results
Increase HDPI/XHDPI Non-XLarge Min Memory to 32
Use Uri.encode with HTML that contains special characters
Fix view tests to account for alternate actionbars
Bug fix for b/4491376 CTS failure in CtsAccessibilityServiceTestCases. Changed to holo.notitle theme and test code.
Add a case for density 213, which is used for some tv devices. The memory requirements are set to be the same as high and xhigh dpi
Fixes AudioRecorderTest and MediaRecorderTest when there are no mics or cameras present