Chung-yih Wang b211825254 am 4d1e0121: Change the keep-alive interval to 10 seconds. ...

Merge commit '4d1e0121277b566b5e1c22e790a3b607b75d945d' into gingerbread-plus-aosp

* commit '4d1e0121277b566b5e1c22e790a3b607b75d945d':
  Change the keep-alive interval to 10 seconds.

2010-09-08 22:42:52 -07:00

..

com/android/server

am 4d1e0121: Change the keep-alive interval to 10 seconds.

2010-09-08 22:42:52 -07:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00