← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to 3rd_party/android-input/android/frameworks/native/include/utils/BufferedTextOutput.h

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
3rd_party/android-input/android/frameworks/native/include/utils/BufferedTextOutput.h
17
17
#ifndef ANDROID_BUFFEREDTEXTOUTPUT_H
18
18
#define ANDROID_BUFFEREDTEXTOUTPUT_H
19
19
 
20
 
#include <androidfw/Platform.h>
21
20
 
22
 
#include ANDROIDFW_UTILS(TextOutput.h)
23
 
#include ANDROIDFW_UTILS(threads.h)
 
21
#include <std/TextOutput.h>
 
22
#include <std/threads.h>
24
23
#include <cutils/uio.h>
25
24
 
26
25
// ---------------------------------------------------------------------------