diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-14 21:19:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 21:19:54 -0700 |
| commit | 4fe18a4998ad1d3d0a62a6b35f9225304c34ef00 (patch) | |
| tree | 24319683f246c43300aa32f54f99ea214d614a3b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 734b8b8cb8b083c62870d63903eb478c3ebe259f (diff) | |
| parent | 8a3621866d8a04b0a229eb5765ea9799e68fd90c (diff) | |
am 8a362186: am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
Merge commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c'
* commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c':
SipService: mScreenOn is flipped to wrong value.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions