diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-06-03 15:44:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 15:44:53 +0000 |
| commit | cffb6041d258fff79dd3d4f9ea989d13a8ee43c9 (patch) | |
| tree | 8a3221eccb1784b0649959c7eebba0bc2429c4b2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cf4a36ba99c47d73018b1df2cb995743d668f335 (diff) | |
| parent | 51c7ce7531f5c1fc1ae442b1c6f206735599cea2 (diff) | |
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev am: 37087ad710
am: 51c7ce7531
* commit '51c7ce7531f5c1fc1ae442b1c6f206735599cea2':
ShortcutManager: Implement usage report API
Change-Id: Ia713dbbb510d2f848b8866a4d0dc692f67803522
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions