diff options
author | Jeff Sharkey <jsharkey@android.com> | 2012-09-19 11:22:14 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-19 11:22:14 -0700 |
commit | a490bddc8bf0812973dee34ead5c04c87e7ecb15 (patch) | |
tree | 8d4dd5cc60571fc9e13253b2eefc24c872e8a7fa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 549be8beadf5ad2a56b7f4269d419753c0d61be8 (diff) | |
parent | 3fe5bf6d69f146077ce9b5e588be8651462b0cd2 (diff) |
Merge changes I4513afbd,I20e2194c into jb-mr1-dev
* changes:
Make getMediaStorageDirectory() user-aware.
Lockdown should only augment connected networks.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions