tree 5b0d4b342f492ed8ec68917d6511cbf9620005f7
parent 34e4628cfbfd78d9314c9b80dd28cbc92d6efba8
parent f9e16c9899001a92a487233422e2b8888d5caeb9
author Chong Zhang <chz@google.com> 1509405400 +0000
committer android-build-merger <android-build-merger@google.com> 1509405400 +0000

Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82
am: f9e16c9899

Change-Id: Id780ff2bfb2f3881cbf33032971ed3b397a2fcde