OSDN Git Service

Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev
authorCraig Mautner <cmautner@google.com>
Thu, 4 Dec 2014 21:51:55 +0000 (21:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Dec 2014 21:52:06 +0000 (21:52 +0000)
commit799cb730298591a9d7303ea051451a3b6dc8e51f
tree5e49a1447e851f52e639838694a08e03159d8d76
parente0dc40c0f232ee2d7c5523f307781ccd3f7cb50b
parent71e737c8e8b970d780b930ebc6eacb4464d4a6aa
Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev
services/core/java/com/android/server/am/ActivityManagerService.java