OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 775a097 b98ee1e)
am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any...
authorCraig Mautner <cmautner@google.com>
Mon, 24 Mar 2014 14:44:17 +0000 (14:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Mar 2014 14:44:17 +0000 (14:44 +0000)
* commit 'b98ee1eb50389520fd06255fd38b233c7adf5814':
  Set ScreenshotSurface secure if any secure content is shown.


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