tree a42ced8f6f5a6b1f7a2edca0dee093d841c0b344
parent 845de5aaad6cf1612183ab36984289edaa283812
parent 744f0e0997f08f00786e4f0266d8cbdb4b2b4569
author yangzhenyu <yangzhenyu@xiaomi.com> 1476720878 +0000
committer android-build-merger <android-build-merger@google.com> 1476720878 +0000

Merge "[ActivityManager] Fix the inconsistence between ProcessRecord and BroadcastQueues" am: 09dcaf1948
am: 744f0e0997

Change-Id: Ib2d02a9a5a04256120c7982b0e1d6298a5d197dc