OSDN Git Service

resolved conflicts for merge of f8a58208 to master
authorCraig Mautner <cmautner@google.com>
Thu, 24 Apr 2014 17:27:04 +0000 (10:27 -0700)
committerCraig Mautner <cmautner@google.com>
Thu, 24 Apr 2014 17:27:37 +0000 (10:27 -0700)
commitd2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6
tree6b8e7a11035ee33b00ebd88d6560e4fcb07bc185
parent80021878a840abffafd9c53e70d39ae2eef90841
parentf8a5820817eb59e0fe16e3ce0f10bb3dca090192
resolved conflicts for merge of f8a58208 to master

Conflicts:
core/java/android/content/pm/PackageParser.java
core/res/res/values/attrs_manifest.xml
core/res/res/values/public.xml

Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
api/current.txt
core/java/android/content/pm/ActivityInfo.java
core/java/android/content/pm/PackageParser.java
core/res/res/values/attrs_manifest.xml
core/res/res/values/public.xml