diff options
| author | Joshua Schwarz <joshuaschwarz@google.com> | 2015-09-03 06:21:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 06:21:11 +0000 |
| commit | 78daa6d32d991c7a84bd0b9eb6f26ef6986c13ae (patch) | |
| tree | 6706b1e6bc557bd95705fd7a90d082260e3cd54d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4b26166065afa0d4a1ace45a7c374bc84cece3e9 (diff) | |
| parent | bade9522cf11141d3bd31ab9d56976a33d05fc64 (diff) | |
am bade9522: am 258a7cd9: Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev
* commit 'bade9522cf11141d3bd31ab9d56976a33d05fc64':
Use LOCAL_MAC_ADDRESS permission in bluetoothtests.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions