OSDN Git Service

am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev
authorCraig Mautner <cmautner@google.com>
Thu, 24 Apr 2014 16:33:02 +0000 (16:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Apr 2014 16:33:02 +0000 (16:33 +0000)
commitf8a5820817eb59e0fe16e3ce0f10bb3dca090192
tree49d78fb80f80c15b75f873bbbeaef0ea71b425c3
parent07bed4921a05e717a4b7f10a25e3830e346426b7
parent03981a4c2e9689197e4d2c916c07ae16207b5276
am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev

* commit '03981a4c2e9689197e4d2c916c07ae16207b5276':
  Add activity attribute allowEmbedded
api/current.txt
core/java/android/content/pm/PackageParser.java
core/res/res/values/attrs_manifest.xml