diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-28 23:05:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-28 23:05:33 +0000 |
| commit | 9c99c55d03a66ad5ba47584340c527c0f843bbe8 (patch) | |
| tree | 2c196d79ea68e07e7bcdc0fe84e8c0a7cc277b35 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e8609de4fb3635ab7182283e94ac56b48c07463a (diff) | |
| parent | 9395dab7c38d540bea926307c448d5cc5032ac7d (diff) | |
am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
* commit '9395dab7c38d540bea926307c448d5cc5032ac7d':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions