OSDN Git Service

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


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