Mike Lockwood 6e8fea14cc Merge "ParcelFileDescriptor: add support for non-stream socket pairs."

2014-12-01 21:17:36 +00:00

..

java

Merge "ParcelFileDescriptor: add support for non-stream socket pairs."

2014-12-01 21:17:36 +00:00

jni

am 41b2381d: am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev

2014-11-27 00:08:51 +00:00

res

am 53651b99: am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev

2014-12-01 19:37:59 +00:00

tests

am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev

2014-12-01 20:00:32 +00:00