diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-07-30 22:10:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-30 22:10:22 +0000 |
| commit | b66cec227739f328b7004a3bb71d4a97b98022af (patch) | |
| tree | b3f508329f5db46814cf21de5485ca26dea4c59c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7e4613ede8ea0daa0428063566ff1cd99e45b50b (diff) | |
| parent | 3c01ac0b199d787f6a81b01ab3b6296421ea40a0 (diff) | |
am 3c01ac0b: am fc0b2e98: am df961732: am f9fdb08c: am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '3c01ac0b199d787f6a81b01ab3b6296421ea40a0':
Introduced android.permission.PEERS_MAC_ADDRESS permission
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions