OSDN Git Service

Merge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into...
authorMichael Wachenschwanz <mwachens@google.com>
Fri, 19 May 2017 18:56:25 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 18:56:25 +0000 (18:56 +0000)
am: d6066c83ca

Change-Id: I9877b678a244e0149ba6bb6aa4a8185113571374

1  2 
core/java/android/os/Parcel.java
core/jni/android_os_Parcel.cpp

Simple merge
Simple merge