Commits · nougat-mr1-cts-dev · halo / cts

24 Jan, 2017 39 commits

Merge "Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for... · b308e957

Android Merger authored 8 years ago

Merge "Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to  the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c  -s ours" into marshmallow-cts-dev am: 3277072a  -s ours" into nougat-cts-dev am: 6678d314  -s ours" into nougat-mr1-cts-dev

b308e957

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for... · 8a31a82c

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to  the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c  -s ours" into marshmallow-cts-dev am: 3277072a  -s ours am: 8d342fe2  -s ours" into nougat-mr1-cts-dev

8a31a82c

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for... · 8fcfb6f7

Tina Zhou authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c -s ours" into marshmallow-cts-dev am: 3277072a -s ours" into nougat-cts-dev
am: 6678d314 -s ours

Change-Id: I305594b29122246237a5d8a0fc89c4b29d2dfbb7

8fcfb6f7

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · 7567bee1

Tina Zhou authored 8 years ago

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c -s ours" into marshmallow-cts-dev am: 3277072a -s ours
am: 8d342fe2 -s ours

Change-Id: I3bd663fa7e2f1c7d5d7c1fcd0e1b26387c2e0872

7567bee1

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for... · 060cb2c9

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to  the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c  -s ours am: b34e5665  -s ours" into nougat-cts-dev am: a689a3bc  -s ours" into nougat-mr1-cts-dev

060cb2c9

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · 018738e2

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to  the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c  -s ours am: b34e5665  -s ours am: 1da8cbb8  -s ours" into nougat-mr1-cts-dev

018738e2

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · f1f0044a

Tina Zhou authored 8 years ago

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c -s ours am: b34e5665 -s ours" into nougat-cts-dev
am: a689a3bc -s ours

Change-Id: I9ca9e6688948f0b1c44548c2d79d45bbe5ee8797

f1f0044a

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · 2910b6ec

Tina Zhou authored 8 years ago

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c -s ours am: b34e5665 -s ours
am: 1da8cbb8 -s ours

Change-Id: I468f94baae0140eee8aa53034f62b564bafd97ee

2910b6ec

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for... · 4fad3e85

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1  -s ours" into marshmallow-cts-dev am: f20f1d9a  -s ours" into nougat-cts-dev am: 8dc4e3f2  -s ours" into nougat-mr1-cts-dev

4fad3e85

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · a59f65dc

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1  -s ours" into marshmallow-cts-dev am: f20f1d9a  -s ours am: 04333816  -s ours" into nougat-mr1-cts-dev

a59f65dc

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · 31ba3f34

Puyuping05 authored 8 years ago

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1 -s ours" into marshmallow-cts-dev am: f20f1d9a -s ours" into nougat-cts-dev
am: 8dc4e3f2 -s ours

Change-Id: Id11ad6f0fdd07250c5e29fe2af15e1a4a5276e44

31ba3f34

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · a684403a

Puyuping05 authored 8 years ago

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1 -s ours" into marshmallow-cts-dev am: f20f1d9a -s ours
am: 04333816 -s ours

Change-Id: Id84009a0a57622662cd7acb1fb83f71ba9674c99

a684403a

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · d308359a

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1  -s ours am: 58bd2533  -s ours" into nougat-cts-dev am: 305f3f3b  -s ours" into nougat-mr1-cts-dev

d308359a

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · ced3c68a

Android Merger authored 8 years ago

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1  -s ours am: 58bd2533  -s ours am: f8f40d7b  -s ours" into nougat-mr1-cts-dev

ced3c68a

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · 8dc6379f

Puyuping05 authored 8 years ago

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1 -s ours am: 58bd2533 -s ours" into nougat-cts-dev
am: 305f3f3b -s ours

Change-Id: I8e125afbb7c7693da3689923244ed947c438ddf6

8dc6379f

DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the... · 82d7355b

Puyuping05 authored 8 years ago

DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1 -s ours am: 58bd2533 -s ours
am: f8f40d7b -s ours

Change-Id: I9f7717027db6f1d6a971a6a55d1757d7fd9e6c81

82d7355b

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for... · 6678d314

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to  the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c  -s ours" into marshmallow-cts-dev am: 3277072a  -s ours" into nougat-cts-dev

6678d314

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · a689a3bc

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to  the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c  -s ours am: b34e5665  -s ours" into nougat-cts-dev

a689a3bc

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · 8d342fe2

Tina Zhou authored 8 years ago

Change-Id: I14e58690533d04d19b5bc8fff3ecd830249e561b

8d342fe2

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · 1da8cbb8

Tina Zhou authored 8 years ago

Change-Id: I35825ad95afbbf087c3a6464ffee29bfc0d60fff

1da8cbb8

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · 8dc4e3f2

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1  -s ours" into marshmallow-cts-dev am: f20f1d9a  -s ours" into nougat-cts-dev

8dc4e3f2

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · 305f3f3b

Android Merger authored 8 years ago

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1  -s ours am: 58bd2533  -s ours" into nougat-cts-dev

305f3f3b

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · 04333816

Puyuping05 authored 8 years ago

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1 -s ours" into marshmallow-cts-dev
am: f20f1d9a -s ours

Change-Id: If291f01fc96fc6f95562fc0d0b5b6c28fda353e9

04333816

DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the... · f8f40d7b

Puyuping05 authored 8 years ago

Change-Id: I14837ef2cfe34379e58255fe1f6099e9b7c2cb79

f8f40d7b

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we... · 3277072a

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to  the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev am: 86787d5c  -s ours" into marshmallow-cts-dev

3277072a

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · f20f1d9a

Android Merger authored 8 years ago

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails. am: b6c7eee1  -s ours" into marshmallow-cts-dev

f20f1d9a

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · b34e5665

Tina Zhou authored 8 years ago

Change-Id: I75db64285bd384d5040c91698a346994d1309159

b34e5665

DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the... · 58bd2533

Puyuping05 authored 8 years ago

Change-Id: I5809abf8edae5cfad6373dcc119fae515b05211c

58bd2533

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated... · 86787d5c

Tina Zhou authored 8 years ago

Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated the FreeType to  the version 2.6.2. But after this modification, when we run cts case: android.theme.cts.ThemeHostTest#testHoloThemes, there are many fails." into lollipop-mr1-cts-dev

86787d5c

Merge "Merge "Fix build, MediaPreparer unit tests" into nougat-cts-dev am:... · d690cf1e
Android Merger authored 8 years ago
```
Merge "Merge "Fix build, MediaPreparer unit tests" into nougat-cts-dev am: f3417083" into nougat-mr1-cts-dev
```
d690cf1e
Merge "Fix build, MediaPreparer unit tests am: 1d61144f " into nougat-mr1-cts-dev · 088cc7b6
Android Merger authored 8 years ago

088cc7b6
Merge "Fix build, MediaPreparer unit tests" into nougat-cts-dev · 4cfc58bc
Sam Lin authored 8 years ago
```
am: f3417083

Change-Id: I5849585651f23473d301d6a05eca3257863777c4
```
4cfc58bc
Fix build, MediaPreparer unit tests · 0f140100
Aaron Holden authored 8 years ago
```
am: 1d61144f

Change-Id: I9e09a028eb23b8a7231959bcef0276f4fccf6ae5
```
0f140100
Merge "Fix build, MediaPreparer unit tests" into nougat-cts-dev · f3417083
Sam Lin authored 8 years ago

f3417083
Fix build, MediaPreparer unit tests · 1d61144f
Aaron Holden authored 8 years ago
```
Test: build and run unit tests
Change-Id: I4f2a26c85b2e93d491f096306f14d6f1ec22260a
```
1d61144f

Merge "Merge "CP MediaStress and MediaPreparer dynamic config changes to... · 8346905d

Android Merger authored 8 years ago

Merge "Merge "CP MediaStress and MediaPreparer dynamic config changes to nougat" into nougat-cts-dev am: 2d27abf9" into nougat-mr1-cts-dev

8346905d

Merge "CP MediaStress and MediaPreparer dynamic config changes to nougat" into nougat-cts-dev · bcf596b9
Tina Zhou authored 8 years ago
```
am: 2d27abf9

Change-Id: Ibbfcfe8ba94dca7dcc7a6cca1cc11fd97699230c
```
bcf596b9
Merge "resolve merge conflicts of d52ec60d to nougat-mr1-cts-dev" into nougat-mr1-cts-dev · b3279393
Tina Zhou authored 8 years ago

b3279393
resolve merge conflicts of d52ec60d to nougat-mr1-cts-dev · 6235bb66
Aaron Holden authored 8 years ago
```
Change-Id: I85d510a4f896a4673030a249b38b7c348ab3c69c
```
6235bb66

23 Jan, 2017 1 commit
- Merge "CP MediaStress and MediaPreparer dynamic config changes to nougat" into nougat-cts-dev · 2d27abf9
  Tina Zhou authored 8 years ago
  
  2d27abf9