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