| commit | aee327fca1584d6c23260924a01a7d04ced3726b | [log] [tgz] |
|---|---|---|
| author | Jungshik Shin <jungshik@google.com> | Tue Feb 14 14:32:33 2017 -0800 |
| committer | JP Sugarbroad <jpsugar@google.com> | Mon Apr 10 12:25:00 2017 -0700 |
| tree | fc91146fc628f4209555630aaf1b2fbe7ea1fc78 | |
| parent | 27dcc3eb6297d425368937aad2e346e33344af87 [diff] |
DO NOT MERGE: resolve merge conflicts of 4bebe6db69 to nyc-dev The original change is https://googleplex-android-review.googlesource.com/#/c/847354/ (appied to lmp-dev and merged through mnc without a conflict). Add a CTS test for FreeType update to 2.6.2+update BUG: 24296662,32240710 Change-Id: I752858dae8ced7130a24670e3f6d4103b303f2f6