Merge "DO NOT MERGE: After we merge the commit for CVE-2014-9675,we updated...
Tina Zhou authored
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