diff options
| author | Junda Liu <junda@google.com> | 2014-09-25 18:17:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 18:17:52 +0000 |
| commit | cfac51091441f33036b489900100214573d20be0 (patch) | |
| tree | ec37ee3368966909576c25682a39c9644fe68148 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fa3f1232ddd0b207082f7993279484f8b78ce68d (diff) | |
| parent | cb6b5f9bd1aa9e83325310ce15c4978d8df3dce6 (diff) | |
am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '63f0b87ee3a0df19eec15e73cfbfb9b97623534c':
Hide CarrierPrivilege APIs in TelMgr.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions