OSDN Git Service
Ruben Brunk [Sat, 30 Mar 2013 01:09:42 +0000 (18:09 -0700)]
am
ee68e231: am
f989f148: am
e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
* commit '
ee68e231281cec7035e1f9e608e0beac7ba8e0a5':
Added "discard unsaved changes" behavior for exiting.
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 [Fri, 29 Mar 2013 23:19:10 +0000 (16:19 -0700)]
am
e3b42481: am
b164f7f6: am
fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
* commit '
e3b42481ead78ac0d768331cf31d29506c27b526':
Add initial implementation of MediaCache.
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 21:35:49 +0000 (14:35 -0700)]
am
5156a6cd: am
8e81dd5c: am
3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce
* commit '
5156a6cd6da43dbb38f7fc7d0797c4e41904f969':
add flexable ui for parameters
Michael Kolb [Fri, 29 Mar 2013 21:35:06 +0000 (14:35 -0700)]
am
a0815128: am
6c9f88af: am
19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce
* commit '
a08151280b80ac2b90b82a292a2bc6d922f3d118':
Make camera releasing synchronous.
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:54:36 +0000 (09:54 -0700)]
am
357f00a1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
357f00a1ce1f1b8584982083f8263e9283117cfa':
Disable preview gestures when shutter is pressed
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:27:36 +0000 (09:27 -0700)]
am
d7518617: am
b8b165ba: am
d4e3912d: Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce
* commit '
d75186178d4f5c89ee7339b5d1acf4f682772066':
Re-enable caching step in RS filters
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:24:34 +0000 (17:24 -0700)]
am
e1284d2d: am
b4723e51: am
62cc2aa4: Add HeaderGridView implementation
* commit '
e1284d2df081ed26acf81642474cc3f9712bef81':
Add HeaderGridView implementation
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:55:31 +0000 (09:55 -0700)]
am
0b69db0c: am
30edf575: am
10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
* commit '
0b69db0c888dba0de5499a0c6a6b501fcb006404':
Disable preview gestures when shutter is pressed
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:42:13 +0000 (23:42 -0700)]
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:59:47 +0000 (20:59 -0700)]
am
9b41ee2c: am
7a46da5f: am
4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
* commit '
9b41ee2c68289e2de29e763a4a217b0273bc6ce0':
Fixed renderscript crashes.
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:04:21 +0000 (15:04 -0700)]
am
696ea2d1: am
d216ea46: am
759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
* commit '
696ea2d16cb03fe11df7311e6981943ac4144fd7':
Make camera calls asynchronous
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:15:30 +0000 (11:15 -0700)]
am
346fd2ef: am
3fa3adce: am
4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
* commit '
346fd2ef30ce7b0841e13e9e63bdba48141f17db':
Workaround for switcher popup being cut off on ICS
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:03:32 +0000 (22:03 -0700)]
am
a287a77d: am
c2bc7ba3: am
0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce
* commit '
a287a77d19f056fafd54745d12640684d3897cf6':
Moves ownership of the environment to the pipeline
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:05:40 +0000 (20:05 -0700)]
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:39:48 +0000 (17:39 -0700)]
am
44dc1fb2: am
4c11a2b6: am
dd2e511d: Add GPSDirection tag using ExifInterface.
* commit '
44dc1fb2f4c5e9125124fa3f960e837ba4ee3e95':
Add GPSDirection tag using ExifInterface.
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 19:17:47 +0000 (12:17 -0700)]
am
e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
e410946c085f6a6b679c5e597abf4b40dbd5ba28':
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
nicolasroard [Tue, 26 Mar 2013 05:27:53 +0000 (05:27 +0000)]
am
136223bb: am
91dd4e7b: am
be31e587: Hides popup indicator on some editors
* commit '
136223bbbc4c8968778168e81e565feb7a71a430':
Hides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 05:26:30 +0000 (05:26 +0000)]
am
91dd4e7b: am
be31e587: Hides popup indicator on some editors
* commit '
91dd4e7b12f32d72ab2f7baaf538a939ca7bfaeb':
Hides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 05:24:44 +0000 (22:24 -0700)]
am
be31e587: Hides popup indicator on some editors
* commit '
be31e587c1485fb8e3d7c8b079250ffbdc26e1b9':
Hides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 04:40:08 +0000 (21:40 -0700)]
Hides popup indicator on some editors
Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae
nicolasroard [Tue, 26 Mar 2013 04:34:34 +0000 (04:34 +0000)]
am
35334379: am
4cdcd1d6: am
91be98c3: Hides seekbar in some editors
* commit '
353343798d22bddd8cca4260e32b8068566f4f09':
Hides seekbar in some editors
nicolasroard [Tue, 26 Mar 2013 04:33:38 +0000 (04:33 +0000)]
am
4cdcd1d6: am
91be98c3: Hides seekbar in some editors
* commit '
4cdcd1d611c31dc4535a124ab9e2a5f00e1dfa14':
Hides seekbar in some editors
nicolasroard [Tue, 26 Mar 2013 04:14:16 +0000 (21:14 -0700)]
am
91be98c3: Hides seekbar in some editors
* commit '
91be98c35f6c5f19d7629bb29e7261970b2f4c67':
Hides seekbar in some editors
nicolasroard [Tue, 26 Mar 2013 04:08:47 +0000 (21:08 -0700)]
Hides seekbar in some editors
Change-Id: Ifce385f9a6bf9b741f0873f49d826fbcf453d97c
Doris Liu [Mon, 25 Mar 2013 23:57:22 +0000 (23:57 +0000)]
am
37a55c37: am
8c6e88ad: am
0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce
* commit '
37a55c370e83a134ef41bbdb204f0815d3016796':
Adding switcher background back in
Doris Liu [Mon, 25 Mar 2013 23:55:21 +0000 (23:55 +0000)]
am
8c6e88ad: am
0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce
* commit '
8c6e88add526e3e28beb04b4cba42e86db0d2bd7':
Adding switcher background back in
Doris Liu [Mon, 25 Mar 2013 23:53:38 +0000 (16:53 -0700)]
am
0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce
* commit '
0dd47d9e60cc94f30253a656ec893347160832de':
Adding switcher background back in
Doris Liu [Mon, 25 Mar 2013 23:52:40 +0000 (23:52 +0000)]
Merge "Adding switcher background back in" into gb-ub-photos-bryce
Doris Liu [Mon, 25 Mar 2013 23:05:31 +0000 (16:05 -0700)]
Adding switcher background back in
Fixed switcher background's rotation issue.
Bug:
8436031
Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938
Mangesh Ghiware [Mon, 25 Mar 2013 22:58:37 +0000 (22:58 +0000)]
am
05bb0642: am
ed4bfae9: am
b2a64665: Add album type to albums table.
* commit '
05bb0642f0e195c4ccdcec058e0d1ff20d0e9528':
Add album type to albums table.
Mangesh Ghiware [Mon, 25 Mar 2013 22:55:59 +0000 (22:55 +0000)]
am
ed4bfae9: am
b2a64665: Add album type to albums table.
* commit '
ed4bfae941dcc8ecc6112d3a313245bd3d057f76':
Add album type to albums table.
Mangesh Ghiware [Mon, 25 Mar 2013 22:54:14 +0000 (15:54 -0700)]
am
b2a64665: Add album type to albums table.
* commit '
b2a646658c87378b681d85a130db705a39d07171':
Add album type to albums table.
Mangesh Ghiware [Mon, 25 Mar 2013 22:38:48 +0000 (15:38 -0700)]
Add album type to albums table.
Change-Id: Ib4dfb1de9d814d2ee41c5b855b69f09115912e57
The Android Automerger [Mon, 25 Mar 2013 12:56:35 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ruben Brunk [Sat, 23 Mar 2013 04:55:20 +0000 (04:55 +0000)]
am
6facf4ee: am
8de91d71: am
05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce
* commit '
6facf4ee4dac960af01bf048add8a5a90c0620bb':
Refactoring: removed unnecessary apply calls.
Ruben Brunk [Sat, 23 Mar 2013 04:54:15 +0000 (04:54 +0000)]
am
8de91d71: am
05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce
* commit '
8de91d71647581203f5513c210798dc8ddf4a51f':
Refactoring: removed unnecessary apply calls.
Ruben Brunk [Sat, 23 Mar 2013 04:53:05 +0000 (21:53 -0700)]
am
05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce
* commit '
05762614aa36d5b8b5ed7acd107360a1abc602e3':
Refactoring: removed unnecessary apply calls.
Ruben Brunk [Sat, 23 Mar 2013 04:52:14 +0000 (04:52 +0000)]
Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce
Ruben Brunk [Sat, 23 Mar 2013 04:20:03 +0000 (21:20 -0700)]
Refactoring: removed unnecessary apply calls.
Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6
Baligh Uddin [Sat, 23 Mar 2013 01:29:33 +0000 (01:29 +0000)]
am
acfea8f0: (-s ours) am
b06f92de: am
2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
acfea8f0bbff96e50a577263827ad5a731ab63db':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 23 Mar 2013 01:27:07 +0000 (01:27 +0000)]
am
b06f92de: am
2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
b06f92de6901802c2b910097052ce88769268e9d':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 23 Mar 2013 01:26:08 +0000 (01:26 +0000)]
am
66aa37eb: (-s ours) am
6c0410a3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
66aa37ebeecd284cd177b284b1e2bd14147e8be4':
Import translations. DO NOT MERGE
OSDN Git Service
