tree d74ba8d6260c909058f9a5c85a628c63ce651292
parent da550d4b244b278bc10406bb5f0e7f17441a4404
parent 5656a6b488ae84bbd80f13f8ff1007134c328f50
author Martijn Coenen <maco@google.com> 1446730285 +0000
committer android-build-merger <android-build-merger@google.com> 1446730285 +0000

Merge "Don\'t free memory that shouldn\'t be freed." am: c4ea0a696e am: 30af63ccfe
am: 5656a6b488

* commit '5656a6b488ae84bbd80f13f8ff1007134c328f50':
  Don't free memory that shouldn't be freed.