summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2010-10-18 12:04:16 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-18 12:04:16 -0700
commitc2e4daacb4470bd43d5db3cf6b82f39be757ebe8 (patch)
treeb5100a0bc39a063781c2d5e447a13d36222c35da /libs/rs/rsScript.cpp
parent9b2f18df2436b6c2d9735e65119b92f320bb57e2 (diff)
parent1f90908c19ab24791bd54c856b32bb12682496eb (diff)
am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp * commit '1f90908c19ab24791bd54c856b32bb12682496eb': Prevent use of NFC api if device is not featurized for NFC.
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions