diff options
| author | Narayan Kamath <narayan@google.com> | 2016-06-06 16:25:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-06 16:25:49 +0000 |
| commit | 1e910877b1770b6e3be7e984c7a465d176c6a841 (patch) | |
| tree | 4d9f88ef95bf5887ccfea4eb2e0961911b5be83b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f028f583459d7e8075dbb4df01d22144e29bd628 (diff) | |
| parent | a5d2245423503bec27009abc6f8a1743dcf20ed3 (diff) | |
Merge "PackageManager: Rename foreign use markers on app installation. am: 110a12dff1 am: 23dca60005" into nyc-mr1-dev-plus-aosp
am: a5d2245423
* commit 'a5d2245423503bec27009abc6f8a1743dcf20ed3':
Change-Id: Ida618599f5551e28d7722ae31e1308fc7e7e99b8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions