Deepanshu Gupta 4a5baeaec9 Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev

2015-01-05 23:26:04 +00:00

..

java

Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev

2015-01-05 23:26:04 +00:00

jni

fix Uss accounting in getPssPid()

2014-12-12 00:20:24 +00:00

res

Fix issue #18901214: APR: Frequent crash in android

2015-01-05 14:40:24 -08:00

tests

Sanitize display names, keep extensions intact.

2014-12-01 09:38:49 -08:00