diff options
| author | Zhihai Xu <zhihaixu@google.com> | 2012-11-29 16:10:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-29 16:10:27 -0800 |
| commit | c5ade0942593222b7fccc1d3921175db0173df93 (patch) | |
| tree | 95ec4ff1422836e97b591850bb3901c8fd336b4b /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | ede31a68976e024b63b02bcd4b36c636423d0411 (diff) | |
| parent | 1d8ea0360923a6dfe84c08806cb69d257bdbbbfe (diff) | |
am 1d8ea036: am ec7a8b6f: am e1a867f6: Merge " BluetoothManagerService call should allow SYSTEM_UID" into jb-mr1.1-dev
* commit '1d8ea0360923a6dfe84c08806cb69d257bdbbbfe':
BluetoothManagerService call should allow SYSTEM_UID
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions