OSDN Git Service

am d2cc56eb: resolved conflicts for merge of f8a58208 to master
authorCraig Mautner <cmautner@google.com>
Thu, 24 Apr 2014 17:34:10 +0000 (17:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Apr 2014 17:34:10 +0000 (17:34 +0000)
commit6af40da8af56df7331d7d9c8b8c030d4c7c56eaa
tree1eab919ccdb48124de1b217640b8907b9a0578b2
parent15b3ee80eed1bd5b8766b468f75413884c8e48d8
parentd2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6
am d2cc56eb: resolved conflicts for merge of f8a58208 to master

* commit 'd2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6':
  Add activity attribute allowEmbedded
api/current.txt