diff options
| author | Dave Langemak <dlangemak@google.com> | 2015-07-31 03:18:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 03:18:01 +0000 |
| commit | 66cff122cc6d123b947be5f28186dc233a7be1aa (patch) | |
| tree | 7a137fc0c8d1209e4697cd363446c95b3be9636b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 058fbd0fef35e62d2baf3e58b7a0c2f24b155dff (diff) | |
| parent | 2e802cac1dc036e62d6744d07d0cad56eb37052a (diff) | |
am 2e802cac: am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit '2e802cac1dc036e62d6744d07d0cad56eb37052a':
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions