OSDN Git Service

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)
commit0c4f066f0b043e6b2678840a7da1db2714abd2d9
treeb8e6738403f5b24d9d4f333f3e964fce9be427f8
parent41846b061226af72eaffbdea4dc44fa2bbd087b1
parentd579be0cf234a35273f79676c102b8bd80e071dc
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am: d579be0cf2

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

Change-Id: Ib1c57040e723d534df8243ad48479e9b554a74d1