diff options
| author | Nick Pelly <npelly@google.com> | 2011-03-25 15:51:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-25 15:51:42 -0700 |
| commit | a585eb17aba237b6de393b9fb88e03b996cb63c1 (patch) | |
| tree | 7ae38bfaf99316981d85de1a3b4b26aaafbcaa1f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e2cb08bd4c3bc7e7045e107af41f7228d780be04 (diff) | |
| parent | 14923862577ef785d20fc5c627248897c9eaddb6 (diff) | |
am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit '14923862577ef785d20fc5c627248897c9eaddb6':
NfcAdapterExtras: reset singleton state if initialization fails.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions