OSDN Git Service

Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev
authorBryan Mawhinney <bryanmawhinney@google.com>
Wed, 20 Jul 2016 19:13:04 +0000 (19:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 19:13:04 +0000 (19:13 +0000)
commit642e50621ae1e04c98d6d9c15c42309e0196921a
tree0fc50752dfd3c5a60ddb8c57b5358d039af24931
parent49bcc5dd80429ecfa1d518eef3726f83f4cb85d6
parent881bc352ee342c69d762ddf8c9edf16f1862c715
Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev
am: 881bc352ee

Change-Id: I323e40003c87b2b892b1cb0712507cabc7b1d1d5