tree 604b77ca04119e31b1222e080b950914edf80656
parent 2d945b6a5c348953f468a2cf22254bff874d5ae1
parent 5c09132bf4d7e789256c9723fe2dfa15a6947bbb
author Wonsik Kim <wonsik@google.com> 1442388139 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442388139 +0000

am 5c09132b: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev

* commit '5c09132bf4d7e789256c9723fe2dfa15a6947bbb':
  DO NOT MERGE NuCachedSource2: fix possible erroneous early free