Michael Wachenschwanz d6066c83ca Merge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into oc-dev ...

am: 61e2b15866

Change-Id: I6dc739ac35e8965b3a6ed84fe03d20c0441193c5

2017-05-19 18:40:47 +00:00

..

java

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

2017-05-19 18:40:47 +00:00

jni

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

2017-05-19 18:40:47 +00:00

proto/android

strong fp lockout after 20 failed attempts

2017-05-12 13:01:01 -07: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

2017-05-19 18:32:20 +00:00