diff options
| author | Ramesh Garimella <rgarimel@codeaurora.org> | 2019-09-17 08:50:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-17 08:50:44 +0000 |
| commit | 4078aa4741c29a0141bdd1e6da15ac1ac7e3f15c (patch) | |
| tree | 692a618278f70d208be6be43073e03eb381f5ef8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0ecc3b2702fa78c5e57ca3b050464270e9e85fea (diff) | |
| parent | b47962a9448ff026e69c74e8e748e95813c780a7 (diff) | |
Merge changes from topic "am-0a015b6d-490c-4457-896d-fc455854e7bd" into r-keystone-qcom-dev
* changes:
[automerger skipped] ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid transitions skipped: 89e291ff60 am: 092ea42664
[automerger skipped] ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid transitions skipped: 89e291ff60
ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid transitions
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions