OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41846b0 d579be0)
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
authorNarayan Kamath <narayan@google.com>
Wed, 1 Jun 2016 17:20:55 +0000 (17:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 17:20:55 +0000 (17:20 +0000)
am: d579be0cf2

* commit 'd579be0cf234a35273f79676c102b8bd80e071dc':
  Fix deadlock when showing subtitles MediaPlayer

Change-Id: Ib1c57040e723d534df8243ad48479e9b554a74d1


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help