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

* commit '05d455ca2b83793a81aac2544c388eec8ac140cd':
  Sanitize display names, keep extensions intact.

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

..

java

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

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

jni

…

res

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

2014-12-01 19:32:12 +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