OSDN Git Service

Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Thu, 8 Jun 2017 05:54:32 +0000 (05:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 05:54:32 +0000 (05:54 +0000)
commitf037caed376f526b0e1106088a6a9f8b1a402847
tree8ff4180dcc0965d31af734532d0e70e556ce8fa4
parentb524ada719c1be84781f4ffa1a29af08e61e6574
parent837f1167caa34f2a4af5abb303a50b06e5a714b9
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
am: 837f1167ca

Change-Id: I2a510538bace272330e1d4446adf2451f3bb4c07
core/java/android/app/ActivityThread.java
core/java/com/android/internal/os/ZygoteInit.java
services/java/com/android/server/SystemServer.java