Ajay Panicker d02e1c3024 Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53 am: d76576b6d1 am: e0211af867 ...

am: af525ff403

Change-Id: I564721fb1ba889cd159f10e769aee4a5bee3db67

2017-01-06 01:57:10 +00:00

..

java

Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53 am: d76576b6d1 am: e0211af867

2017-01-06 01:57:10 +00:00

jni

Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca

2017-01-06 01:09:26 +00:00

proto/android

Clean up file names for protos

2016-12-20 22:28:56 -08:00

res

resolve merge conflicts of cb29c97907 to nyc-mr2-dev-plus-aosp

2017-01-05 16:11:25 -08:00

tests

Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4 am: 7495cf633c am: d7f371813a

2017-01-06 00:29:31 +00:00