Merge commit '88ea2eec63ee5209842a5940b6f11c44a0bc2345' into HEAD
tree: d70d579b3216906aa307a12552e4e735e5e284ae
  1. src/
  2. Android.mk
  3. jarjar-rules.txt