Casey Dahlin 2c19dbeff5 Merge "Add hidden support for arrays of raw file descriptors" am: 376d5f350c ...

am: 7a38be6112

* commit '7a38be61124fb1d75ed73cdd4050ba25047d2b03':
  Add hidden support for arrays of raw file descriptors

2015-11-13 00:07:48 +00:00

..

java

Merge "Add hidden support for arrays of raw file descriptors" am: 376d5f350c

2015-11-13 00:07:48 +00:00

jni

Merge "Parse method-trace properties only in debug builds." am: 8fa7e93050

2015-11-11 17:05:42 +00:00

res

Import translations. DO NOT MERGE

2015-11-11 18:41:18 +01:00

tests

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00