OSDN Git Service
Angus Kong [Tue, 2 Apr 2013 15:24:07 +0000 (08:24 -0700)]
am
b4edf5b3: am
ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
* commit '
b4edf5b3d83a369f1197617891dc959109e703b8':
Handle InterruptedException in waitDone
Ruben Brunk [Tue, 2 Apr 2013 15:24:04 +0000 (08:24 -0700)]
am
65ef29f9: am
0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
* commit '
65ef29f96b44267076ca38c4bffc752d92d1f087':
Added apply UI callbacks for rotate/mirror operations.
Angus Kong [Tue, 2 Apr 2013 15:23:51 +0000 (08:23 -0700)]
am
07abb731: am
36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce
* commit '
07abb731115e3e6c3aec954d7bcec495aed2a262':
Don't use SynchronousQueue to pass results.
Bobby Georgescu [Tue, 2 Apr 2013 15:23:45 +0000 (08:23 -0700)]
am
adde6e72: am
8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
* commit '
adde6e725f2e721cb9fc18c4ca2d3f8d62d0bda4':
Usage statistics for camera settings
Bobby Georgescu [Tue, 2 Apr 2013 15:23:45 +0000 (08:23 -0700)]
am
36f54901: am
6058af44: Enforce bmp type in pool, handle MTP image decode failure
* commit '
36f54901e1a475c74c633cd9ad6b9ba8ae28448f':
Enforce bmp type in pool, handle MTP image decode failure
Angus Kong [Mon, 1 Apr 2013 23:14:26 +0000 (16:14 -0700)]
am
ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
* commit '
ce9ca226e0c24865314e962b3b276b5ed2f2899d':
Handle InterruptedException in waitDone
Angus Kong [Mon, 1 Apr 2013 23:13:16 +0000 (23:13 +0000)]
Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
Ruben Brunk [Mon, 1 Apr 2013 23:09:18 +0000 (16:09 -0700)]
am
0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
* commit '
0b65c2c2fdf5f9ce4d0740697db4c74a9b6cbdc6':
Added apply UI callbacks for rotate/mirror operations.
Ruben Brunk [Mon, 1 Apr 2013 23:07:42 +0000 (23:07 +0000)]
Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 22:59:09 +0000 (15:59 -0700)]
Handle InterruptedException in waitDone
Dirty bit for mParameters should be set properly if getParameters is not
finished.
bug:
8517092
Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0
Angus Kong [Mon, 1 Apr 2013 22:19:02 +0000 (15:19 -0700)]
am
36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce
* commit '
36cac0c2a107a05225185430969975f7dfd81c89':
Don't use SynchronousQueue to pass results.
Angus Kong [Mon, 1 Apr 2013 22:17:30 +0000 (22:17 +0000)]
Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 21:30:30 +0000 (14:30 -0700)]
Don't use SynchronousQueue to pass results.
bug:
8517092
Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d
Bobby Georgescu [Mon, 1 Apr 2013 21:48:47 +0000 (14:48 -0700)]
am
8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
* commit '
8f8811fa16147532716e5a4a70fda2f555d20589':
Usage statistics for camera settings
Bobby Georgescu [Mon, 1 Apr 2013 21:45:42 +0000 (14:45 -0700)]
am
6058af44: Enforce bmp type in pool, handle MTP image decode failure
* commit '
6058af443b087ba50741cc3e61ec70e830e498fa':
Enforce bmp type in pool, handle MTP image decode failure
Bobby Georgescu [Mon, 1 Apr 2013 21:45:34 +0000 (21:45 +0000)]
Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
Ruben Brunk [Mon, 1 Apr 2013 21:41:45 +0000 (14:41 -0700)]
Added apply UI callbacks for rotate/mirror operations.
Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640
Bobby Georgescu [Mon, 1 Apr 2013 20:48:29 +0000 (13:48 -0700)]
Enforce bmp type in pool, handle MTP image decode failure
- GalleryBitmapPool didn't reject bitmap types other than
ARGB_8888 which could lead to problems when a different type
is used for recycling.
- BitmapFactory throws an exception rather than returning null
when image decoding fails and an existing bitmap was supplied
for recycling, even if the failure was not caused by the use
of that bitmap. When decoding things from an MTP device, we
need to handle this since unsupported formats may be returned.
Change-Id: I8cc8aa46f5a741b360e806814991f74a131e9039
Bobby Georgescu [Mon, 1 Apr 2013 21:31:40 +0000 (14:31 -0700)]
Usage statistics for camera settings
Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647
Angus Kong [Mon, 1 Apr 2013 18:10:57 +0000 (11:10 -0700)]
am
960cad7f: am
bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
* commit '
960cad7f4c7ccdd1d0979c06fe5c97fb610aefa6':
Fix NPE when reconnecting camera.
Angus Kong [Mon, 1 Apr 2013 18:07:38 +0000 (11:07 -0700)]
am
bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
* commit '
bb746823c1b966562ed4f0f170289cd133f6ff6c':
Fix NPE when reconnecting camera.
Angus Kong [Mon, 1 Apr 2013 18:06:06 +0000 (18:06 +0000)]
Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
Bobby Georgescu [Mon, 1 Apr 2013 17:48:22 +0000 (10:48 -0700)]
am
62b8cc9e: am
8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
* commit '
62b8cc9e846f33503e4fa3c03f543b26f6a932e6':
Preliminary Album grid header in new gallery
Bobby Georgescu [Mon, 1 Apr 2013 17:44:28 +0000 (10:44 -0700)]
am
8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
* commit '
8227ac6685be19bda8e3601c3980847ae8cf3041':
Preliminary Album grid header in new gallery
Bobby Georgescu [Mon, 1 Apr 2013 17:42:46 +0000 (17:42 +0000)]
Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 29 Mar 2013 22:58:42 +0000 (15:58 -0700)]
Preliminary Album grid header in new gallery
Change-Id: I90942de920795aedc5475f23cc3ede459949cc16
Angus Kong [Mon, 1 Apr 2013 16:55:24 +0000 (09:55 -0700)]
Fix NPE when reconnecting camera.
bug:
8513852
Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
George Mount [Mon, 1 Apr 2013 14:15:17 +0000 (07:15 -0700)]
am
1dba3693: am
c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce
* commit '
1dba3693c3ca87b288b8329e5b243c1067d29c04':
Remove ImageCache from PhotoProvider in favor of MediaCache.
George Mount [Mon, 1 Apr 2013 14:12:35 +0000 (07:12 -0700)]
am
c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce
* commit '
c6a1167ec0e461ad202b58614f1a53ec38443654':
Remove ImageCache from PhotoProvider in favor of MediaCache.
George Mount [Mon, 1 Apr 2013 14:10:38 +0000 (14:10 +0000)]
Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce
nicolasroard [Sat, 30 Mar 2013 22:04:44 +0000 (15:04 -0700)]
am
9af3e6b8: am
5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
* commit '
9af3e6b8d517ca7a1585dc5f373072b8148adb74':
Fix double-tap behaviour
nicolasroard [Sat, 30 Mar 2013 22:04:43 +0000 (15:04 -0700)]
am
de0f9f15: am
1ad3cd57: Fixes some state synchronization issues
* commit '
de0f9f15badb8cc26cfbdf5e93321a838a6fa6d8':
Fixes some state synchronization issues
nicolasroard [Sat, 30 Mar 2013 22:03:08 +0000 (15:03 -0700)]
am
5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
* commit '
5997a0138287fe08f414ffb097c8e088a47bf101':
Fix double-tap behaviour
nicolasroard [Sat, 30 Mar 2013 22:03:07 +0000 (15:03 -0700)]
am
1ad3cd57: Fixes some state synchronization issues
* commit '
1ad3cd574da4e998e55e4ff4861ff19e2ea982bd':
Fixes some state synchronization issues
nicolasroard [Sat, 30 Mar 2013 22:01:33 +0000 (22:01 +0000)]
Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
nicolasroard [Sat, 30 Mar 2013 19:56:20 +0000 (12:56 -0700)]
Fix double-tap behaviour
Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e
nicolasroard [Sat, 30 Mar 2013 19:08:58 +0000 (12:08 -0700)]
Fixes some state synchronization issues
Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
nicolasroard [Sat, 30 Mar 2013 02:29:06 +0000 (19:29 -0700)]
am
dd43c25b: am
ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce
* commit '
dd43c25b0b2e58a02369d791404f101d9cab1990':
Implements progressive rendering
nicolasroard [Sat, 30 Mar 2013 02:28:03 +0000 (19:28 -0700)]
am
ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce
* commit '
ad42027590c52fcc522c06d311f28742e0441ec0':
Implements progressive rendering
nicolasroard [Sat, 30 Mar 2013 02:26:18 +0000 (02:26 +0000)]
Merge "Implements progressive rendering" into gb-ub-photos-bryce
nicolasroard [Fri, 29 Mar 2013 21:41:38 +0000 (14:41 -0700)]
Implements progressive rendering
Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf
Ruben Brunk [Sat, 30 Mar 2013 01:08:06 +0000 (18:08 -0700)]
am
f989f148: am
e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
* commit '
f989f14860ce9e0b551f140141816464a7024616':
Added "discard unsaved changes" behavior for exiting.
Ruben Brunk [Sat, 30 Mar 2013 01:04:40 +0000 (18:04 -0700)]
am
e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
* commit '
e0e9fff3ff81faec02b243eabb1502a97a4e4adb':
Added "discard unsaved changes" behavior for exiting.
Ruben Brunk [Sat, 30 Mar 2013 01:03:24 +0000 (01:03 +0000)]
Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
George Mount [Wed, 27 Mar 2013 23:53:41 +0000 (16:53 -0700)]
Remove ImageCache from PhotoProvider in favor of MediaCache.
Change-Id: I4e75a094d1dc033ac892c2b95bdc6b6a4a165304
George Mount [Fri, 29 Mar 2013 23:17:39 +0000 (16:17 -0700)]
am
b164f7f6: am
fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
* commit '
b164f7f694d1f93090e26fc242b45a3c8d4fb7ce':
Add initial implementation of MediaCache.
George Mount [Fri, 29 Mar 2013 23:16:08 +0000 (16:16 -0700)]
am
fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
* commit '
fe2aa4ba06d045895d0d038627547e02adc6b945':
Add initial implementation of MediaCache.
George Mount [Fri, 29 Mar 2013 23:15:21 +0000 (23:15 +0000)]
Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 16:51:21 +0000 (09:51 -0700)]
Add initial implementation of MediaCache.
Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b
Ruben Brunk [Fri, 29 Mar 2013 19:36:30 +0000 (12:36 -0700)]
Added "discard unsaved changes" behavior for exiting.
Bug:
7534778
Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac
John Hoford [Fri, 29 Mar 2013 19:21:59 +0000 (12:21 -0700)]
am
8e81dd5c: am
3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce
* commit '
8e81dd5c98d8d13fcc15f1c2a24565c55f815085':
add flexable ui for parameters
John Hoford [Fri, 29 Mar 2013 19:16:30 +0000 (12:16 -0700)]
am
3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce
* commit '
3f3128579b1215142ce71268bdb5be33426d6ccb':
add flexable ui for parameters
John Hoford [Fri, 29 Mar 2013 19:14:51 +0000 (19:14 +0000)]
Merge "add flexable ui for parameters" into gb-ub-photos-bryce
John Hoford [Tue, 12 Mar 2013 23:30:10 +0000 (16:30 -0700)]
add flexable ui for parameters
Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921
Michael Kolb [Fri, 29 Mar 2013 17:29:57 +0000 (10:29 -0700)]
am
6c9f88af: am
19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce
* commit '
6c9f88af5336ee07779cc6ef172e8f4524039eb0':
Make camera releasing synchronous.
Michael Kolb [Fri, 29 Mar 2013 17:28:03 +0000 (10:28 -0700)]
am
19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce
* commit '
19f625a13abf3ea418a541299630481f1a7aaa45':
Make camera releasing synchronous.
Michael Kolb [Fri, 29 Mar 2013 17:26:07 +0000 (17:26 +0000)]
Merge "Make camera releasing synchronous." into gb-ub-photos-bryce
The Android Open Source Project [Fri, 29 Mar 2013 16:49:17 +0000 (09:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I824c53b5cb75e9076acb41d0e5385499a25f3141
nicolasroard [Fri, 29 Mar 2013 16:25:32 +0000 (09:25 -0700)]
am
b8b165ba: am
d4e3912d: Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce
* commit '
b8b165badbebc7bd7b75c43db5f89cc13dbd1f9c':
Re-enable caching step in RS filters
nicolasroard [Fri, 29 Mar 2013 16:22:26 +0000 (09:22 -0700)]
am
d4e3912d: Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce
* commit '
d4e3912d3f6f92da6e2fd0441cd65aef2c4d06da':
Re-enable caching step in RS filters
nicolasroard [Fri, 29 Mar 2013 16:20:51 +0000 (16:20 +0000)]
Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce
nicolasroard [Thu, 28 Mar 2013 23:34:52 +0000 (16:34 -0700)]
Re-enable caching step in RS filters
Bug:
8478659
Bug:
8459181
Bug:
8450339
Bug:
8457323
With the compatibility library, different Scripts instances
actually points to the same thing. We thus need to explicitely
rebind all the variables to the correct script instance before
running RS filters...
Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b
Angus Kong [Fri, 29 Mar 2013 00:07:03 +0000 (17:07 -0700)]
Make camera releasing synchronous.
bug:
8502943
Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
Bobby Georgescu [Fri, 29 Mar 2013 00:22:54 +0000 (17:22 -0700)]
am
b4723e51: am
62cc2aa4: Add HeaderGridView implementation
* commit '
b4723e5144712d43f6ab1e91cae5299b8d394a49':
Add HeaderGridView implementation
Bobby Georgescu [Fri, 29 Mar 2013 00:21:24 +0000 (17:21 -0700)]
am
62cc2aa4: Add HeaderGridView implementation
* commit '
62cc2aa4400a4ad03cfc6025e9d25c61015cdef4':
Add HeaderGridView implementation
Bobby Georgescu [Thu, 28 Mar 2013 22:41:32 +0000 (15:41 -0700)]
Add HeaderGridView implementation
Change-Id: Id0e699be0e40310c4919a9d55503edb9b07d4b58
Doris Liu [Thu, 28 Mar 2013 00:25:43 +0000 (17:25 -0700)]
Disable preview gestures when shutter is pressed
Bug:
8333662
Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
Doris Liu [Thu, 28 Mar 2013 16:54:02 +0000 (09:54 -0700)]
am
30edf575: am
10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
* commit '
30edf57559cd46e7cdb191a61fd2138bf6ead905':
Disable preview gestures when shutter is pressed
Doris Liu [Thu, 28 Mar 2013 16:52:25 +0000 (09:52 -0700)]
am
10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
* commit '
10bd1e0c43b39ad3314a213822403588141cc7f5':
Disable preview gestures when shutter is pressed
Doris Liu [Thu, 28 Mar 2013 16:50:07 +0000 (16:50 +0000)]
Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
The Android Automerger [Thu, 28 Mar 2013 12:56:13 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Thu, 28 Mar 2013 06:40:08 +0000 (23:40 -0700)]
nicolasroard [Thu, 28 Mar 2013 06:38:14 +0000 (23:38 -0700)]
nicolasroard [Thu, 28 Mar 2013 05:10:01 +0000 (22:10 -0700)]
Fix deadlock.
Move the RenderScript context and Resources to CachingPipeline.
bug:
8491107
Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d
Ruben Brunk [Thu, 28 Mar 2013 03:57:41 +0000 (20:57 -0700)]
am
7a46da5f: am
4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
* commit '
7a46da5f63f021f6675849fe7ba8b4fe54c9b3d5':
Fixed renderscript crashes.
Ruben Brunk [Thu, 28 Mar 2013 03:55:34 +0000 (20:55 -0700)]
am
4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
* commit '
4a1caa577565fb64804706de3abf8917ba915a1f':
Fixed renderscript crashes.
Ruben Brunk [Thu, 28 Mar 2013 03:53:46 +0000 (03:53 +0000)]
Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
Doris Liu [Thu, 28 Mar 2013 00:25:43 +0000 (17:25 -0700)]
Disable preview gestures when shutter is pressed
Bug:
8333662
Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
Angus Kong [Wed, 27 Mar 2013 22:01:07 +0000 (15:01 -0700)]
am
d216ea46: am
759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
* commit '
d216ea465e60d5e447fa2c32ff950bbb1e9d02a9':
Make camera calls asynchronous
Angus Kong [Wed, 27 Mar 2013 21:59:32 +0000 (14:59 -0700)]
am
759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
* commit '
759ef774229db788024b2da6cadefe06fd96cd96':
Make camera calls asynchronous
Angus Kong [Wed, 27 Mar 2013 21:58:31 +0000 (21:58 +0000)]
Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
Angus Kong [Tue, 26 Mar 2013 06:11:43 +0000 (23:11 -0700)]
Make camera calls asynchronous
bug:
8438047
Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
Ruben Brunk [Wed, 27 Mar 2013 18:19:23 +0000 (11:19 -0700)]
Fixed renderscript crashes.
Bug:
8478659
Bug:
8459181
Bug:
8450339
Bug:
8457323
createFilter() initializes a ton of parameters in the RenderScript
filters. Using stale parameters from a previous call to createFilter()
causes segfaults.
Change-Id: Id54b956b7fe83be5089b1d47c3bedcca66237ddf
Doris Liu [Wed, 27 Mar 2013 18:13:34 +0000 (11:13 -0700)]
am
3fa3adce: am
4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
* commit '
3fa3adcea76a693d51ae29aed0edd283ff1706d3':
Workaround for switcher popup being cut off on ICS
Doris Liu [Wed, 27 Mar 2013 18:11:30 +0000 (11:11 -0700)]
am
4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
* commit '
4520e5edf00761e8f90e023330d9a90f0de37e70':
Workaround for switcher popup being cut off on ICS
Doris Liu [Wed, 27 Mar 2013 18:10:18 +0000 (18:10 +0000)]
Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
Doris Liu [Wed, 27 Mar 2013 17:52:50 +0000 (10:52 -0700)]
Workaround for switcher popup being cut off on ICS
Bug:
8390375
Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d
The Android Automerger [Wed, 27 Mar 2013 12:56:22 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Wed, 27 Mar 2013 05:02:12 +0000 (22:02 -0700)]
am
c2bc7ba3: am
0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce
* commit '
c2bc7ba3b404ed7556e99e7f9cb50150e242dab1':
Moves ownership of the environment to the pipeline
nicolasroard [Wed, 27 Mar 2013 05:00:19 +0000 (22:00 -0700)]
am
0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce
* commit '
0629d70d6b03a84741050ac9f3add8db0adad9c6':
Moves ownership of the environment to the pipeline
nicolasroard [Wed, 27 Mar 2013 04:58:13 +0000 (04:58 +0000)]
Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce
nicolasroard [Sat, 23 Mar 2013 05:02:37 +0000 (22:02 -0700)]
Moves ownership of the environment to the pipeline
Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
Angus Kong [Wed, 27 Mar 2013 03:04:10 +0000 (20:04 -0700)]
am
e1073df5: am
53a06d0d: Remove debug log.
* commit '
e1073df5751cfd90c81ae30d97319d9b54513578':
Remove debug log.
Angus Kong [Wed, 27 Mar 2013 03:02:33 +0000 (20:02 -0700)]
am
53a06d0d: Remove debug log.
* commit '
53a06d0d76c7f59aa5678f9a8d72f211b3ace773':
Remove debug log.
Angus Kong [Wed, 27 Mar 2013 02:58:34 +0000 (19:58 -0700)]
Remove debug log.
Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43
Angus Kong [Wed, 27 Mar 2013 00:36:59 +0000 (17:36 -0700)]
am
4c11a2b6: am
dd2e511d: Add GPSDirection tag using ExifInterface.
* commit '
4c11a2b6131e8c428451484375f372833c9aa7de':
Add GPSDirection tag using ExifInterface.
Angus Kong [Wed, 27 Mar 2013 00:34:54 +0000 (17:34 -0700)]
am
dd2e511d: Add GPSDirection tag using ExifInterface.
* commit '
dd2e511d212ddc438760b23b8cdf5081daccc9ef':
Add GPSDirection tag using ExifInterface.
Angus Kong [Tue, 26 Mar 2013 18:40:40 +0000 (11:40 -0700)]
Add GPSDirection tag using ExifInterface.
bug:
8115825
Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9
The Android Open Source Project [Tue, 26 Mar 2013 17:49:40 +0000 (10:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia8c3c7215b620c1cf453cd01fa8420d50061f879
The Android Automerger [Tue, 26 Mar 2013 12:56:10 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev