diff options
| author | Andres Morales <anmorales@google.com> | 2015-08-06 22:54:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 22:54:53 +0000 |
| commit | 768352fdae6fc92805d11dd4e1a1220a25b5f5a5 (patch) | |
| tree | ba808c1517d4a591e17f105921dc42552fe6fa62 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | df89203a9747221a9d0673a985a6bebe3e0acae4 (diff) | |
| parent | e0a7cfa026da56f1197c1feea79f76153c5eddd5 (diff) | |
am e0a7cfa0: am 981c4561: am 7ab11e45: am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev
* commit 'e0a7cfa026da56f1197c1feea79f76153c5eddd5':
[UserManager] expose method to retrieve credential owner
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions