OSDN Git Service

resolve merge conflicts of 5c9e47d28b24 to oc-mr1-dev-plus-aosp
authorTobias Thierer <tobiast@google.com>
Thu, 19 Oct 2017 15:12:57 +0000 (16:12 +0100)
committerJeff Sharkey <jsharkey@google.com>
Thu, 19 Oct 2017 15:33:17 +0000 (15:33 +0000)
commit301bf35e2df9e3f2efa5dbf1c2df69e10be7f6e8
treeff127ed004f4707c41fc2d6261b38831f43e6af6
parentd2ff3244dc64b05b3b9e2bedbdd120a8dfdde022
parent5c9e47d28b249395fa74787065f83769b886c036
resolve merge conflicts of 5c9e47d28b24 to oc-mr1-dev-plus-aosp

Test: This merge conflict was automatically resolved by meld.
      The automatic resolution of the same merge conflict by meld
      from cherrypicking this CL into internal-master has passed
      Treehugger (and was already submitted).
Exempt-From-Owner-Approval: Resolving merge conflicts with no deltas
Change-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b
core/java/com/android/internal/os/KernelCpuSpeedReader.java
media/java/android/media/MediaPlayer.java
services/core/java/com/android/server/pm/PackageInstallerSession.java
services/core/java/com/android/server/pm/PackageManagerServiceUtils.java