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