diff options
| author | Winson Chung <winsonc@google.com> | 2015-11-13 18:21:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-13 18:21:55 +0000 |
| commit | d45a18c8eca074f8c83a64ed465021a61becb49a (patch) | |
| tree | ca0271072a65c345cb1c4d5442a2f53b518da86a /rs/java/android/renderscript/ProgramFragment.java | |
| parent | dce0f8040dcce494166832eb6c1e8a2d9638ddd4 (diff) | |
| parent | 32265b9ea000b04ac62f3c114edb063246260401 (diff) | |
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0
am: 32265b9ea0 -s ours
* commit '32265b9ea000b04ac62f3c114edb063246260401':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions