tree 468fa41eb8dac66e630cf35ecfbff58679d06b3e
parent 02e857441fcc27134f335aee659d553641a2b2ab
parent 3359bbe02ca645bae2f495df51e7b4001de6c2b1
author Craig Mautner <cmautner@google.com> 1398386545 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398386545 +0000

am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev

* commit '3359bbe02ca645bae2f495df51e7b4001de6c2b1':
  Add test for attribute android:allowEmbedded