OSDN Git Service

resolved conflicts for merge of ecf09321 to master
authorBen Murdoch <benm@google.com>
Tue, 20 May 2014 17:58:06 +0000 (18:58 +0100)
committerBen Murdoch <benm@google.com>
Tue, 20 May 2014 18:13:39 +0000 (19:13 +0100)
commitf564c7fe86d2aa9a7622667771d9e4bbf5518ffa
tree2d5e4644e044c37448b0319392ee65592fcfa887
parentd41b9116800a5f17d2cab3a773c8cf52070fb9fb
parentecf09321c5604558b159057e430b7faf7e6a7352
resolved conflicts for merge of ecf09321 to master

Change-Id: I7a440204dfc79f3b82bd95d3d1276158bf3d44a2
api/current.txt
core/java/android/content/pm/PackageManager.java