diff options
| author | Chris Tate <ctate@android.com> | 2016-05-20 17:37:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-20 17:37:04 +0000 |
| commit | 065f9db98c62a7867316bef195bdac3ad4e6cf7b (patch) | |
| tree | fe5af33667b7764cadecf50d47e1a983ef08e762 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c33d1055bf23269672d3a71524793ae75755be7c (diff) | |
| parent | 97e9d8e9df61ae5aa7accbd98b20da745edea1a4 (diff) | |
Merge "Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: d33151bf4f" into nyc-mr1-dev-plus-aosp
am: 97e9d8e9df
* commit '97e9d8e9df61ae5aa7accbd98b20da745edea1a4':
Put launch adjacent activity in a new task if the activity does exist
Change-Id: I8f00b7d34c6441aebe8d7d488b79c888d4c47e52
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions