summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgram.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2010-10-19 09:53:03 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-19 09:53:03 -0700
commit5bc8c853f5f8118b172bb4651aba58fd254c3cb7 (patch)
tree4eda6b25a9733fa8f63b203fdf6a22bb623b36b7 /libs/rs/rsProgram.cpp
parentc46b2a7b591a02bb6beeb2f62c7e571588ca6aa9 (diff)
parentc2e4daacb4470bd43d5db3cf6b82f39be757ebe8 (diff)
am c2e4daac: am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread
Merge commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8' * commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8': Prevent use of NFC api if device is not featurized for NFC.
Diffstat (limited to 'libs/rs/rsProgram.cpp')
0 files changed, 0 insertions, 0 deletions