diff options
| author | Chris Tate <ctate@android.com> | 2016-10-13 19:28:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 19:28:39 +0000 |
| commit | b5bf44d92cf45e188337ed18c89e7253258c23ed (patch) | |
| tree | e2fb2e04eeda51ad804ce26722976d4d8065e19e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0031626e58a6e88f1bfdd38b9c85b5b7190fcc77 (diff) | |
| parent | f051de84d53c58cbeb9d23a3088d1d3e3eedd317 (diff) | |
Merge "Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee am: 622e97ffaf" into nyc-mr1-dev-plus-aosp
am: f051de84d5
Change-Id: I725f1a9c287f5c3eeb51e5ae7eb4607d9ca177ed
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions