diff options
| author | Mady Mellor <madym@google.com> | 2016-06-02 17:01:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-02 17:01:01 +0000 |
| commit | 0165c546abf86175ad1949ae1c1360d2963dfbf1 (patch) | |
| tree | 36459b6a4d70ec0b67c6843a5f95d8b77d12db0c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ba526c47bb0de254a4e866ee4dbddf1b9c4f6d71 (diff) | |
| parent | a6d5dabde2485a9285e09389c23c51498db80aaa (diff) | |
Merge "Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 am: ece7cd7120" into nyc-mr1-dev-plus-aosp
am: a6d5dabde2
* commit 'a6d5dabde2485a9285e09389c23c51498db80aaa':
Change-Id: I57ad86e98f00b19e2580f03873a19a83d35e965d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions