OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1804841 38883bd)
am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure...
authorDaniel Sandler <dsandler@android.com>
Thu, 8 Nov 2012 21:13:49 +0000 (13:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 21:13:49 +0000 (13:13 -0800)
* commit '38883bdd0088277771efca72c80e33773408d72e':
  Only show the bouncer for the assistant if secure.


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