diff options
| author | Nathan Harold <nharold@google.com> | 2015-10-22 03:13:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 03:13:02 +0000 |
| commit | 869a4e4cacd6f2c59ab5833592d0e06b1e48d47a (patch) | |
| tree | e6f6f86949b87881d665eaccc4f06ccca366e36b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d391813b7076d7bb0fb67a9c946c98de55d9bf20 (diff) | |
| parent | ce73642a5804a50468fa9bc928333653948c5549 (diff) | |
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 am: 5be7dbc88d am: b129c106bd
am: ce73642a58
* commit 'ce73642a5804a50468fa9bc928333653948c5549':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions