OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a566a98 400988b)
am 400988b6: am fbb0796e: am 3359bbe0: Merge "Add test for attribute android:allowEmb...
authorCraig Mautner <cmautner@google.com>
Fri, 25 Apr 2014 16:08:55 +0000 (16:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Apr 2014 16:08:55 +0000 (16:08 +0000)
* commit '400988b69c2ee1e9e9502f12cbb407f1cc867da6':
  Add test for attribute android:allowEmbedded


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help