tree c3fe9cbe86741ce1f5adfd3c326434a1e98951fe
parent 982779eed8b4e405f0f46ceda6bdea5f3c32fcff
parent f9ca28cada9010ed3fc91e437bffeb31cb7600f6
author xiaoli.xb.zuo <xiaoli.xb.zuo@sonymobile.com> 1473357633 +0000
committer android-build-merger <android-build-merger@google.com> 1473357633 +0000

Merge "Fix memory leak in MediaScannerConnection am: 439e5e49fb am: 6e02888c94" into nyc-mr1-dev-plus-aosp
am: f9ca28cada

Change-Id: I808a4045092bb90f018b4f92a105244053ee2bb4