summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author David Brown <dab@google.com> 2010-09-15 17:43:34 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-15 17:43:34 -0700
commitb6f8989385bd69e3b6fc56f5a095917f8624ed7e (patch)
tree03cd8f0e56638cfa8f2702e883333a927ec2cb58 /libs/hwui/Program.cpp
parent06fb6e07652038c137c6aa29cc0add215370ccaf (diff)
parent0237cf2eace5d35410e95f586fd40c3068c94582 (diff)
am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '0237cf2eace5d35410e95f586fd40c3068c94582' * commit '0237cf2eace5d35410e95f586fd40c3068c94582': Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions