diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-09-20 06:33:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-20 06:33:24 +0000 |
| commit | 7efc56cc65f5eaa2ecb9c0bc0acb698cb4f34172 (patch) | |
| tree | 75930729b2387c65544a4322137880c7c73f32b1 /rs/java/android/renderscript/RenderScript.java | |
| parent | eacf98bf52e84d6f96620357e41dc8e91075ba97 (diff) | |
| parent | 8d302da986ba7d0916a9fdf73aa03b921c686fc2 (diff) | |
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492
am: 8d302da986 -s ours
Change-Id: I1c1edf783ae5c466ed8c89978de5d5dfd9adb643
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions