Go to file
Yu Shan Emily Lau 3f4f0214c1 am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
* commit '797f5b0c00895c21ff755ec7f6974e1d2e763b13':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:45:37 -07:00
cmds KeyStore: Update the parameters of generating master keys. 2010-10-01 01:42:55 +08:00
include Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 2011-03-15 13:44:58 -07:00
libs SurfaceTexture: disallow unsupported uses. 2011-03-15 10:37:37 -07:00
opengl fix [4107131] nvidia driver call takes a very long time 2011-03-16 14:19:03 -07:00
services/surfaceflinger SurfaceFlinger: Respect the PROTECTED gralloc bit. 2011-03-10 16:25:48 -08:00
vpn Make VpnService synchronous API. 2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00