diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2016-05-20 17:43:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-20 17:43:21 +0000 |
| commit | 45f59f33605793446a9472bb1370abaa9bc57517 (patch) | |
| tree | fe5af33667b7764cadecf50d47e1a983ef08e762 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 065f9db98c62a7867316bef195bdac3ad4e6cf7b (diff) | |
| parent | 9f981621b24c11536f6791abfd61573e7c4b0267 (diff) | |
Merge "Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev am: a781232656 am: 117c975fe2" into nyc-mr1-dev-plus-aosp
am: 9f981621b2
* commit '9f981621b24c11536f6791abfd61573e7c4b0267':
Change-Id: Icfe49ca3548a7c56e994b2b26c352e25416c8109
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions