diff options
author | yuanhuihui <yuanhuihui@xiaomi.com> | 2016-09-06 23:46:18 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-06 23:46:18 +0000 |
commit | d56515bc5d5ee927de903510f2abefc3dd61a8ce (patch) | |
tree | 0b3694d43aaccb918fadb02da45e6d1945b5bf7a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a4da2335b9f3e3064153fe1eba96929294b70f5e (diff) | |
parent | a68fda1ac83820e5bbc9145c79dcb0c8aaf598fd (diff) |
Merge "Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012 am: 130cb9232a am: b24828bd77" into nyc-mr1-dev-plus-aosp
am: a68fda1ac8
Change-Id: I722f3d1717e2c13c1177a82547bbf10748a61157
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions