OSDN Git Service

Merge "Clean up atoms.proto" into pi-dev
authorChenjie Yu <cjyu@google.com>
Fri, 30 Mar 2018 23:09:17 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Mar 2018 23:09:17 +0000 (23:09 +0000)
commit622b392c20029b75a0ba7a8f0272a95e5ddd0be0
tree485e6e5cf9b90ec75938ad3197e39546cbb2bab5
parent02c7881824560b6705d64f7502df2633e3c44751
parent9fef2594f39474920c8f0552e10566727f9ba57f
Merge "Clean up atoms.proto" into pi-dev
am: 9fef2594f3

Change-Id: If643c3ebd8800c1d55d20a21850e9b56e35acfab
services/core/java/com/android/server/am/ActivityManagerService.java