summaryrefslogtreecommitdiffstats
path: root/MODULE_LICENSE_APACHE2
diff options
context:
space:
mode:
authorDave Sparks <davidsparks@android.com>2009-05-21 10:27:18 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-21 10:27:18 -0700
commit67d5fc6b5982ab091ad419a5adfc8b81e97d1de1 (patch)
tree7f8052530ebba1a2c8a26f609196ae7d6b3fe59e /MODULE_LICENSE_APACHE2
parent51ec709aeeba4a3f6ce335786d1b126222c89020 (diff)
parent7283fb18022674daee4dcdc3a218190791f8cd0e (diff)
downloadframeworks_base-67d5fc6b5982ab091ad419a5adfc8b81e97d1de1.zip
frameworks_base-67d5fc6b5982ab091ad419a5adfc8b81e97d1de1.tar.gz
frameworks_base-67d5fc6b5982ab091ad419a5adfc8b81e97d1de1.tar.bz2
am 7283fb18: Merge commit \'7b7225c8fdbead25235c74811b30ff4ee690dc58\' into manual_merge
Merge commit '7283fb18022674daee4dcdc3a218190791f8cd0e' * commit '7283fb18022674daee4dcdc3a218190791f8cd0e': AI 149133: Enable the camera permission check.
Diffstat (limited to 'MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions