Bryce Lee b8bcdf50e4 Merge "Disallow starting activities without new task from non-activity context." into oc-dev ...

am: 3ebe54b3e6

Change-Id: I4a89ce60dad32f41f4e77b81a6af56c89845987a

2017-05-22 14:43:32 +00:00

..

java

Merge "Disallow starting activities without new task from non-activity context." into oc-dev

2017-05-22 14:43:32 +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