tree e78786a49c352d3a218030e5ed65680017828258
parent b1748f87b16d9fbbdbba05f0b20e1e34f3400c48
parent bd7101937a722264757ac3f7329216ac25449371
author Chong Zhang <chz@google.com> 1509410460 +0000
committer android-build-merger <android-build-merger@google.com> 1509410460 +0000

Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8 am: e3ac25eb0c
am: bd7101937a

Change-Id: I78a26c3abfb72e9b873b719506f869df0aa87da1