diff options
| author | Nathan Harold <nharold@google.com> | 2015-10-22 02:18:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 02:18:46 +0000 |
| commit | d66bb15f1a48b4407bd02652940c399c3c65b31b (patch) | |
| tree | 972e35608f8cbfa19a8276ec1171df60014dfcf1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fdcc4d4235c829a41b4d23043431bb8fa915a440 (diff) | |
| parent | c3a94cb6c2097ae2b30500a32ecf95b5714bd8c2 (diff) | |
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f am: dc9f8fab0f am: 1a3c88a5bf
am: c3a94cb6c2
* commit 'c3a94cb6c2097ae2b30500a32ecf95b5714bd8c2':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions