diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-20 17:34:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-20 17:34:09 -0700 |
| commit | fb5dbfea1abc75603c8132e9fb23b79b15f378fa (patch) | |
| tree | 242747348dd2d86bbf773d6cfaa59f3787dfd8b4 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7d73e227fe52f92eb9fd0b4326ee70d73ec819c9 (diff) | |
| parent | 86c41e8f250899149c89693e1ad0f7dcf580bfd1 (diff) | |
am 86c41e8f: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '86c41e8f250899149c89693e1ad0f7dcf580bfd1':
TelephonyManager.listen can have notifyNow always true.
add ViewGroup's layoutMode attribute to public resources bug: 9359960
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions