tree fc91e5ac9f368e3fa3fc803c22f88802436278c3
parent fbb56778822183f46d024ef2c4d46634bff4dab8
parent 30af63ccfe160852e82e71f253b7c14986eb8fd5
author Martijn Coenen <maco@google.com> 1446730138 +0000
committer android-build-merger <android-build-merger@google.com> 1446730138 +0000

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

* commit '30af63ccfe160852e82e71f253b7c14986eb8fd5':
  Don't free memory that shouldn't be freed.