diff options
author | Ben Murdoch <benm@google.com> | 2014-12-08 16:38:50 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2014-12-08 16:38:50 +0000 |
commit | 961d742ab1110bbdc5e8d2604c297e4ff27d4789 (patch) | |
tree | 58fdd8ebe93243b36fdce503f665d266044f6b44 /ft2.target.linux-arm64.mk | |
parent | f26a45c7b6a8cf5f2770599b6668e22748af2738 (diff) | |
parent | 512d7c35f09fb0ffd783df8bb8ed461ded554ca3 (diff) | |
download | freetype-lollipop-mr1-dev.tar.gz |
Merge from Chromium at DEPS revision 39.0.2171.95android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-dev
This commit was generated by merge_to_master.py.
Change-Id: I27cfdabe6d9543ab52db6b13ef249c91e49225d9
Diffstat (limited to 'ft2.target.linux-arm64.mk')
0 files changed, 0 insertions, 0 deletions