tree 86d49c8150ea6ef4c770f6593262ff207ad1b8e9
parent 43f55e5953bb974abdb07bdee2d88db3402c87f4
author Natiq Ahmed <mnatiq@codeaurora.org> 1412074090 +0530
committer Linux Build Service Account <lnxbuild@localhost> 1415115441 -0700

Compilation fix for AOSP update

Fixed systemui and device crash on bootup in msim mode

Conflicts:
services/core/java/com/android/server/ConnectivityService.java
Change-Id: Idf836ec01e18f8e64c972e3a54b279618e4d6ed6