Narayan Kamath 0051514845 resolved conflicts for merge of 396b9e79 to master ...

Change-Id: Ie71a79699be57f5af6069559068bf6253835d805

2014-02-13 11:48:48 +00:00

..

java

am 5137fa03: am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"

2014-02-13 01:11:41 +00:00

jni

am 4f2d02fb: am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

2014-02-13 01:11:47 +00:00

res

resolved conflicts for merge of 396b9e79 to master

2014-02-13 11:48:48 +00:00

tests

am 32acb5e9: am 97de064a: am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases"

2014-02-12 23:01:30 +00:00