Michael Wachenschwanz 291ba2f0a4 Merge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into oc-dev am: 61e2b15866 ...

am: d6066c83ca

Change-Id: I9877b678a244e0149ba6bb6aa4a8185113571374

2017-05-19 18:56:25 +00:00

..

java

Merge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into oc-dev am: 61e2b15866

2017-05-19 18:56:25 +00:00

jni

Merge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into oc-dev am: 61e2b15866

2017-05-19 18:56:25 +00:00

proto/android

Merge "strong fp lockout after 20 failed attempts" into oc-dev am: 310818ff82

2017-05-13 00:03:18 +00:00

res

Merge "Import translations. DO NOT MERGE" into oc-dev

2017-05-18 23:46:48 +00:00

tests

Merge "Cumulative wakelock time per uid" into oc-dev am: 1effe000b8

2017-05-19 18:41:45 +00:00