diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-02-06 09:13:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-06 09:13:58 -0800 |
| commit | 150edcaf8b7eeeba8a4753eb0f6b9855ad1e1eb1 (patch) | |
| tree | c49a0f1ddd73f2727f8b88eeb9e4d456e4738ed6 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 91641ec5538aa3b9872f24c43f811bffbcd12368 (diff) | |
| parent | 90976c8493ab9439eb8ddaad30aaa0d171467f43 (diff) | |
am 90976c84: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# By Adam Powell
# Via The Android Automerger (1) and The Android Open Source Project (1)
* commit '90976c8493ab9439eb8ddaad30aaa0d171467f43':
Fix re-enabled state of up after action view collapse
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions