Peng Xu ed2986ca91 Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev am: 3ab258c98d ...

am: 5d34ce7f65

Change-Id: If08c2b50114940ff75795f4c15b005ece7958b6b

2017-04-27 05:09:46 +00:00

..

java

Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev am: 3ab258c98d

2017-04-27 05:09:46 +00:00

jni

Merge "Return correct value at initDataInjection and avoid crash" into oc-dev am: 1c5b71ec1f

2017-04-26 01:01:48 +00:00

proto/android

Add missing services to incident_report

2017-04-17 15:37:57 -07:00

res

Merge "AOD: Fix layout" into oc-dev am: f84b208a12

2017-04-26 17:46:17 +00:00

tests

Merge "Avoid ClassCastException in ArrayMap." into oc-dev am: f9e5395081

2017-04-27 01:38:07 +00:00