diff options
author | Marco Nelissen <marcone@google.com> | 2013-04-08 16:42:17 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-08 16:42:17 -0700 |
commit | d563cede5cf4ca2647dcf00775dd0ed1dd08e792 (patch) | |
tree | abbd7a9d2b88145dc95e7ebc6bfb9da1144919de /services/input/InputReader.h | |
parent | b3be67ce34966dfccfccf4918ee5c93c4971a6d0 (diff) | |
parent | c4ad3cb07ed76c5697c60285456d9c49675174d9 (diff) | |
download | frameworks_base-d563cede5cf4ca2647dcf00775dd0ed1dd08e792.zip frameworks_base-d563cede5cf4ca2647dcf00775dd0ed1dd08e792.tar.gz frameworks_base-d563cede5cf4ca2647dcf00775dd0ed1dd08e792.tar.bz2 |
am c4ad3cb0: Merge "Add support for common encryption" into jb-mr2-dev
* commit 'c4ad3cb07ed76c5697c60285456d9c49675174d9':
Add support for common encryption
Diffstat (limited to 'services/input/InputReader.h')
0 files changed, 0 insertions, 0 deletions