Derek Sollenberger 13e659cc55 am 869939a1: am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev ...

* commit '869939a186c610de90d247bc27f26260a26c3daa':
  Fix memory leak where we close the descriptor instead of the file.

2014-09-24 22:54:10 +00:00

..

java

resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp

2014-09-24 15:47:36 -07:00

jni

am 869939a1: am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev

2014-09-24 22:54:10 +00:00

res

am 8d084fa2: am 9727cd7f: am 98769dc2: am c0e5eb2b: Merge "Fix issue #17632804: Add resource padding" into lmp-dev

2014-09-24 17:58:21 +00:00

tests

…