diff options
| author | Nick Pelly <npelly@google.com> | 2011-03-22 10:14:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 10:14:36 -0700 |
| commit | 14923862577ef785d20fc5c627248897c9eaddb6 (patch) | |
| tree | ccff765f66f2432e691ccfdd0629265bdec1fd6a /graphics/java/android/renderscript/ProgramStore.java | |
| parent | 03aa986e6b19e436c71801d2e5af6f44521a94ab (diff) | |
| parent | e69f4267e1cdf5353fffa99a0d49f4c9069415b9 (diff) | |
am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit 'e69f4267e1cdf5353fffa99a0d49f4c9069415b9':
NfcAdapterExtras: reset singleton state if initialization fails.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions