diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-28 23:05:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-28 23:05:42 +0000 |
| commit | 1872ce3e7af0e2130a9e8f9f52983cd234f6ead0 (patch) | |
| tree | b1dd15946e26f959b04c5eef3a9ac2d27ab990e8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c9b937bbfae825e32158e06ca52f320ca3d6f464 (diff) | |
| parent | 155e3133407e590f18e7e16eddc6fc743f35b0fd (diff) | |
am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
* commit '155e3133407e590f18e7e16eddc6fc743f35b0fd':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions