android_packages_apps_Gallery2/AndroidManifest.xml, branch cm-10.2 Unnamed repository; edit this file 'description' to name the repository. Gallery2: Add mimetype of AVI,DIVX to support streaming. 2013-08-18T23:27:05+00:00 Vasantha Balla vballa@codeaurora.org 2013-07-26T14:11:04+00:00 d4866d8266fec7fb5d2d2764120f4f96894515ff -Mimetype of avi and divx is not added in AndroidManifest.xml to support streaming. -Avi Mimetype "video/x-msvideo" and Divx mimetype "video/divx" needs to be added in AndroidManifest.xml. -Fix is to add avi and divx mimetypes in AndriodManifest.xml. CRs-Fixed: 517049 Change-Id: Ibda05a258096d6730163ea0d73897d985aad99dc 
 -Mimetype of avi and divx is not added in AndroidManifest.xml
  to support streaming.
 -Avi Mimetype "video/x-msvideo" and Divx mimetype "video/divx"
  needs to be added in AndroidManifest.xml.
 -Fix is to add avi and divx mimetypes in AndriodManifest.xml.

 CRs-Fixed: 517049

Change-Id: Ibda05a258096d6730163ea0d73897d985aad99dc
Merge tag 'android-4.3_r2.1' into cm-10.2 2013-07-25T15:45:04+00:00 Ricardo Cerqueira cyanogenmod@cerqueira.org 2013-07-25T15:11:24+00:00 3d0f648752a3b67d4577e9a2a18a23ec7bfcd893 Android 4.3 release 2.1 Conflicts: Android.mk AndroidManifest.xml src/com/android/gallery3d/filtershow/FilterShowActivity.java src/com/android/gallery3d/filtershow/ui/ImageCurves.java Change-Id: I8e29f03fbb5de003e97f7180e287661bd9142a97 
Android 4.3 release 2.1

Conflicts:
	Android.mk
	AndroidManifest.xml
	src/com/android/gallery3d/filtershow/FilterShowActivity.java
	src/com/android/gallery3d/filtershow/ui/ImageCurves.java

Change-Id: I8e29f03fbb5de003e97f7180e287661bd9142a97
Typo in manifest 2013-07-12T15:45:35+00:00 DHOMD DHO@dho.im 2013-07-12T15:45:35+00:00 77f2afb51787c25801a4c59e31af90bb8350cd0d From AOSP Change-Id: I123f7d8a2b30337e6224aba1e0fd6d78a24d5233 
From AOSP

Change-Id: I123f7d8a2b30337e6224aba1e0fd6d78a24d5233
Bump up the version number to 1.1.40012 2013-05-20T22:59:20+00:00 Bart Sears bsears@google.com 2013-05-20T22:59:20+00:00 a83166dfc97c6d45b03728a2ae32b085e91b8d0c Bug: 8607157 Change-Id: I5fdf05fd4d10a54f72129177572285d438740b97 
Bug: 8607157
Change-Id: I5fdf05fd4d10a54f72129177572285d438740b97
Remove new camera activity code from Bryce 2013-04-25T20:56:47+00:00 Doris Liu tianliu@google.com 2013-04-25T20:41:12+00:00 52a069f0839cbc0bff49ea359a497f65d127ef3b Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a 
Bug: 8722017
Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
Bump up the version number to 1.1.40011 2013-04-23T01:43:29+00:00 Bart Sears bsears@google.com 2013-04-23T01:43:29+00:00 86d622f79e9b72b78b7d9b34c66c6ed9d83c9ea5 Bug: 8607157 Change-Id: I7fc2c526228d9526b0af28181b6505173bbfbd7d 
Bug: 8607157
Change-Id: I7fc2c526228d9526b0af28181b6505173bbfbd7d
Remove photos from gallery2 manifest 2013-04-19T21:12:55+00:00 John Reck jreck@google.com 2013-04-19T17:04:12+00:00 93074e91a15a926c079a40d7bc86025d5297259b Bug: 8659787 Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351 
 Bug: 8659787

Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351
Bump up the version number to 1.1.40010 2013-04-12T20:48:58+00:00 Bart Sears bsears@google.com 2013-04-12T20:48:58+00:00 4772792dbe4a29bd90139eead6a881f47523ede5 Bug: 8607157 Change-Id: I4c0f4cd481d0989cad2fd9cadbda9f7768b81765 
Bug: 8607157
Change-Id: I4c0f4cd481d0989cad2fd9cadbda9f7768b81765
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce 2013-04-09T22:59:08+00:00 Ruben Brunk rubenbrunk@google.com 2013-04-09T22:59:08+00:00 dcd1dd986bc8455ce822e8d9e7a46ea103228351 






Moving crop to a separate activity.  Refactoring.
2013-04-09T22:57:57+00:00

Ruben Brunk
rubenbrunk@google.com

2013-04-05T00:20:42+00:00

6fe165b7d28299d5b2f97deb135b233d84eb300f

Bug: 8526929

Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce





Bug: 8526929

Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce