diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-05-26 02:18:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 02:18:05 +0000 |
| commit | afb018e836af03e93d4d4b6de7f68cb9da6a387d (patch) | |
| tree | cabbd4d1e543cfdfcaedc4c176391578eb6a336c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a96bd319c6032c99a57ab3b8ab212d2793c98777 (diff) | |
| parent | ade0bce32ae9dbacccf8d75695cda99b56a014f3 (diff) | |
Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a
am: ade0bce32a
* commit 'ade0bce32ae9dbacccf8d75695cda99b56a014f3':
Use app's best locale if they override LocaleList
Change-Id: Ib573235d174892c714e6864d8f34ac3a909b2d1c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions