diff options
| author | Michael Wright <michaelwr@google.com> | 2015-11-17 23:27:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-17 23:27:26 +0000 |
| commit | 9bac0a1d24fc75d08fb2e2fb24c547f4ce42f5e0 (patch) | |
| tree | a7495808aa2f44e59efd65512e3c41ea647b9b79 /rs/java/android/renderscript/Program.java | |
| parent | 93f027c32f8402cb499eee02b351253414fc947a (diff) | |
| parent | 46f92eafe669f3ae29299860bf79378ffa111898 (diff) | |
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7
am: 46f92eafe6 -s ours
* commit '46f92eafe669f3ae29299860bf79378ffa111898':
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions