diff options
| author | Nancy Chen <nancychen@google.com> | 2015-01-26 19:59:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-26 19:59:58 +0000 |
| commit | 792d576e7743c2bc36df7d3258792f665f6341c8 (patch) | |
| tree | 09904906486c9dd903c31beed1b940f3de596394 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d5f35c20226740e6fe6397aaf7caf6dacd5e635f (diff) | |
| parent | 885c856e6babfe88be1d6a029f185329bb3dfcc7 (diff) | |
am 42d45bb1: Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev automerge: f55d132
automerge: 885c856
* commit '885c856e6babfe88be1d6a029f185329bb3dfcc7':
Add method in TelecomManager to return line1Number for a PhoneAccount.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions