| commit | 6678d3147a102a86d7f27c3e9f765b530bea3d53 | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Tue Jan 24 15:41:44 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 24 15:41:44 2017 +0000 |
| tree | 71cb4a5b1837e9c03b041fc99a497f8fa5521b7d | |
| parent | a689a3bc6262e8574da7085c2d84edfe0549b521 [diff] | |
| parent | 8d342fe24e46598acf8ca53cb0e9c665a98ff8b9 [diff] |
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: 86787d5c5c -s ours" into marshmallow-cts-dev am: 3277072a31 -s ours" into nougat-cts-dev