tree d8b4f137254f2dbcfb17b20b79122920584b59cb
parent 0792ef644d202950120f4c0b104b23b9c23bce77
author Bhavya Sokke Mallikarjunappa <bsokke@codeaurora.org> 1405038779 -0700
committer Linux Build Service Account <lnxbuild@localhost> 1415115365 -0700

Enable NSRM (network socket request manager)

NSRM is a feature to synchronize app socket requests
to reduce network signalling and there by save some power.

Change-Id: Ice992713994045d0582f8cfb7b6761e2689f2555
Conflicts:
services/core/java/com/android/server/AlarmManagerService.java