diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:53:28 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:53:28 +0100 |
| commit | 2bac2ec7167835b214bfe42e762cd2ce6cf8cf1a (patch) | |
| tree | a14562a0ce4aecbdab44c9403437b8ac6039964e /sample/chromium/font_subsetter.h | |
| parent | 58f132533b4126b00bc71fd9aed69ecf568cdf39 (diff) | |
| parent | c9326c76ab650d96f89cc4e68d4612c7d6c0e61c (diff) | |
| download | src-lollipop-cts-release.tar.gz | |
Merge from Chromium at DEPS revision 278205HEADwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1ub-webview-m40-releasemaster-soongmastermainlollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-preview
This commit was generated by merge_to_master.py.
Change-Id: Ib7c08f7a72935d08151c90f550035659aa7205b5
Diffstat (limited to 'sample/chromium/font_subsetter.h')
| -rw-r--r-- | sample/chromium/font_subsetter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sample/chromium/font_subsetter.h b/sample/chromium/font_subsetter.h index 07b1b5b..b891784 100644 --- a/sample/chromium/font_subsetter.h +++ b/sample/chromium/font_subsetter.h @@ -18,7 +18,7 @@ #ifndef SFNTLY_CPP_SRC_TEST_FONT_SUBSETTER_H_ #define SFNTLY_CPP_SRC_TEST_FONT_SUBSETTER_H_ -#include <cstddef> +#include <stddef.h> class SfntlyWrapper { public: |