diff options
| author | John Wang <johnwang@google.com> | 2011-06-03 17:35:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-03 17:35:46 -0700 |
| commit | 03133d50a39e0793c2d7f6f5399d2928aac5e057 (patch) | |
| tree | 542c2cef9f1ebc1e29cbe3d05befcebacd344ca2 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cd11cc711a87fdd28e2e0013380d3cc9d26e82a2 (diff) | |
| parent | 0b1923ce512d278336aab0c780d439b655e29b1c (diff) | |
am 0b1923ce: am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
* commit '0b1923ce512d278336aab0c780d439b655e29b1c':
Add supplyPuk to do SIM puk unlock.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions