Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94396be9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "libbinder: hide BufferedTextOutput.h" am: 1225b814 am: cbfa62e1 

Change-Id: I7e07186332ef3b0881d971257a2aa078c6e6170c
parents a046c965 cbfa62e1

libs/binder/BufferedTextOutput.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#include <binder/BufferedTextOutput.h>

#include "BufferedTextOutput.h"

#include <binder/Debug.h>

#include <binder/Debug.h>





#include <cutils/atomic.h>

#include <cutils/atomic.h>

libs/binder/Static.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 




#include "Static.h"

#include "Static.h"





#include <binder/BufferedTextOutput.h>

#include "BufferedTextOutput.h"

#include <binder/IPCThreadState.h>

#include <binder/IPCThreadState.h>

#include <utils/Log.h>

#include <utils/Log.h>