diff options
| author | Anthony Hugh <ahugh@google.com> | 2016-11-30 03:39:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-30 03:39:45 +0000 |
| commit | 0f68eb222448b091892210310ca42f1d0e9ee380 (patch) | |
| tree | 9236972871235fc954b3c14ecc535ff7f414ac7e /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | c3ac4a2025190164827df2880009882416790947 (diff) | |
| parent | 6abec500324ba240eba3d563ca7e348fa2cfffd7 (diff) | |
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e" into nyc-mr2-dev-plus-aosp
am: 6abec50032 -s ours
Change-Id: I8684c26867a84287f5e8ccee51eb1e15278338f1
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions