OSDN Git Service
The Android Open Source Project [Wed, 20 Mar 2013 16:49:09 +0000 (16:49 +0000)]
am
a71294be: (-s ours) am
bbe63c7c: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a71294be477249bda2e42c86293bf0a72a528272':
am
783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
am
3ccb0e3e: Add a cleanstep for the build server...
am
42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
am
0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce
am
978f4aae: Fix for crash upon saving image
am
d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce
am
39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
The Android Open Source Project [Wed, 20 Mar 2013 16:46:47 +0000 (16:46 +0000)]
am
bbe63c7c: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
bbe63c7c84d92f7f59be207af2bfdb5662a6dc8f':
am
783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
am
3ccb0e3e: Add a cleanstep for the build server...
am
42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
am
0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce
am
978f4aae: Fix for crash upon saving image
am
d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce
am
39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
The Android Open Source Project [Wed, 20 Mar 2013 16:32:48 +0000 (09:32 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id9603d15a01a36a07a95a23336e62a6b2c58bc16
The Android Automerger [Wed, 20 Mar 2013 12:56:09 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Victor Doba [Wed, 20 Mar 2013 10:35:46 +0000 (10:35 +0000)]
am
c823d4a8: am
d571b703: am
26bf2194: am
00551024: Method added to load scaled resource (with only alpha channel).
* commit '
c823d4a81b23ef051e1283a89c329b20ffd1223b':
Method added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:33:16 +0000 (10:33 +0000)]
am
d571b703: am
26bf2194: am
00551024: Method added to load scaled resource (with only alpha channel).
* commit '
d571b703f939e1663bf6c7ab12ffad0c025897df':
Method added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:30:38 +0000 (10:30 +0000)]
am
26bf2194: am
00551024: Method added to load scaled resource (with only alpha channel).
* commit '
26bf21943edfa94dd9d0d7f6c0dbcc1ed05b5289':
Method added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:28:14 +0000 (03:28 -0700)]
am
00551024: Method added to load scaled resource (with only alpha channel).
* commit '
0055102404c767af2cd5fabf70acbc8317e33fe3':
Method added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:24:21 +0000 (11:24 +0100)]
Method added to load scaled resource (with only alpha channel).
Change-Id: I1b9a58e0fd4c33c9748ad03f53d635c426a5102c
Bart Sears [Wed, 20 Mar 2013 04:04:29 +0000 (04:04 +0000)]
am
fc57d4f2: am
0731870b: am
91adfa42: am
39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
* commit '
fc57d4f2f2c4d465ffbebe448bfb89229dc6c9bb':
Bump up the version number to 1.1.40005
Bart Sears [Wed, 20 Mar 2013 04:01:58 +0000 (04:01 +0000)]
am
0731870b: am
91adfa42: am
39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
* commit '
0731870b624f4c888ad041268ebcc3b516ae3014':
Bump up the version number to 1.1.40005
Bart Sears [Wed, 20 Mar 2013 03:59:17 +0000 (03:59 +0000)]
am
91adfa42: am
39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
* commit '
91adfa42485f6724a2dc60db0ba09fd2739b8cc6':
Bump up the version number to 1.1.40005
nicolasroard [Wed, 20 Mar 2013 03:57:53 +0000 (03:57 +0000)]
am
8f5847f5: am
55b0b5e8: am
e9fce93e: am
269d2c86: Add accessor for filters to the source bitmap passed to apply()
* commit '
8f5847f541b39f1f053cc1a48995e8693fd0c56b':
Add accessor for filters to the source bitmap passed to apply()
Bart Sears [Wed, 20 Mar 2013 03:56:04 +0000 (20:56 -0700)]
am
39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
* commit '
39c14cee9cc748a932d78fb9d430effa12027f7b':
Bump up the version number to 1.1.40005
nicolasroard [Wed, 20 Mar 2013 03:55:22 +0000 (03:55 +0000)]
am
55b0b5e8: am
e9fce93e: am
269d2c86: Add accessor for filters to the source bitmap passed to apply()
* commit '
55b0b5e8e4804d28a3d5a166b656195dab427593':
Add accessor for filters to the source bitmap passed to apply()
Bart Sears [Wed, 20 Mar 2013 03:55:02 +0000 (03:55 +0000)]
Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
nicolasroard [Wed, 20 Mar 2013 03:52:41 +0000 (03:52 +0000)]
am
e9fce93e: am
269d2c86: Add accessor for filters to the source bitmap passed to apply()
* commit '
e9fce93e9db512be5da55731dec51c3d7154890f':
Add accessor for filters to the source bitmap passed to apply()
nicolasroard [Wed, 20 Mar 2013 03:50:54 +0000 (20:50 -0700)]
am
269d2c86: Add accessor for filters to the source bitmap passed to apply()
* commit '
269d2c8602e8893b0bf399324b2072783ba0f37c':
Add accessor for filters to the source bitmap passed to apply()
nicolasroard [Wed, 20 Mar 2013 03:13:33 +0000 (20:13 -0700)]
Add accessor for filters to the source bitmap passed to apply()
Change-Id: I2900c5b799592c388daa9049093ef8c80fa4f5c6
Ruben Brunk [Wed, 20 Mar 2013 00:58:06 +0000 (00:58 +0000)]
am
1271c734: am
9d2e6c78: am
c8e5be66: am
8898eaab: Fixed onDestroy ordering for RS context.
* commit '
1271c734e5893d36b4c16da7e0aa9b75b1f44a84':
Fixed onDestroy ordering for RS context.
Ruben Brunk [Wed, 20 Mar 2013 00:54:35 +0000 (00:54 +0000)]
am
9d2e6c78: am
c8e5be66: am
8898eaab: Fixed onDestroy ordering for RS context.
* commit '
9d2e6c78497a615ff195a71bfa98cba7caf5ff18':
Fixed onDestroy ordering for RS context.
Ruben Brunk [Wed, 20 Mar 2013 00:13:00 +0000 (00:13 +0000)]
am
c8e5be66: am
8898eaab: Fixed onDestroy ordering for RS context.
* commit '
c8e5be6690e11fde21f288d22653a46bef56d013':
Fixed onDestroy ordering for RS context.
Ruben Brunk [Wed, 20 Mar 2013 00:11:46 +0000 (17:11 -0700)]
am
8898eaab: Fixed onDestroy ordering for RS context.
* commit '
8898eaabfa0cdf70e00078d2dea810f9aab4dfd1':
Fixed onDestroy ordering for RS context.
Ruben Brunk [Tue, 19 Mar 2013 23:39:24 +0000 (16:39 -0700)]
Fixed onDestroy ordering for RS context.
Bug:
8420637
Change-Id: Iddceaa3aefd3d905bbc7435350b768d10215b1d8
nicolasroard [Tue, 19 Mar 2013 22:17:33 +0000 (22:17 +0000)]
am
5deec30c: am
0de08996: am
f0e726c5: am
33fca9ef: Fix some startup issues, performance issues on ICS
* commit '
5deec30c39e7d48319495e285f4d03302e82abe9':
Fix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 22:15:37 +0000 (22:15 +0000)]
am
0de08996: am
f0e726c5: am
33fca9ef: Fix some startup issues, performance issues on ICS
* commit '
0de089969e1f59a83e9c316390400f3badef1da9':
Fix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 22:13:29 +0000 (22:13 +0000)]
am
f0e726c5: am
33fca9ef: Fix some startup issues, performance issues on ICS
* commit '
f0e726c539b4f9193a7764a881809c00433a26c4':
Fix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 22:11:48 +0000 (15:11 -0700)]
am
33fca9ef: Fix some startup issues, performance issues on ICS
* commit '
33fca9ef7f89b60e3b1a361fdf5fc597b3994e74':
Fix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 21:46:17 +0000 (14:46 -0700)]
Fix some startup issues, performance issues on ICS
Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf
Bobby Georgescu [Tue, 19 Mar 2013 18:48:04 +0000 (18:48 +0000)]
am
d0d98ad1: am
d8a14e78: am
bb547e5e: am
94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
* commit '
d0d98ad121b434371d53dadbc4ef9a71ddb36111':
Add album viewing to new Gallery
Bobby Georgescu [Tue, 19 Mar 2013 18:45:24 +0000 (18:45 +0000)]
am
d8a14e78: am
bb547e5e: am
94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
* commit '
d8a14e78aca0c7645c1f949fca1493a9859df340':
Add album viewing to new Gallery
Bobby Georgescu [Tue, 19 Mar 2013 18:42:53 +0000 (18:42 +0000)]
am
bb547e5e: am
94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
* commit '
bb547e5efc0aaca5c2035a20639980a376b9a1a4':
Add album viewing to new Gallery
Bobby Georgescu [Tue, 19 Mar 2013 18:40:49 +0000 (11:40 -0700)]
am
94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
* commit '
94660ff80259917e207fa15a971db1cd619dad5b':
Add album viewing to new Gallery
Bobby Georgescu [Tue, 19 Mar 2013 18:39:02 +0000 (18:39 +0000)]
Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 18 Mar 2013 21:56:40 +0000 (14:56 -0700)]
Add album viewing to new Gallery
Change-Id: I71230541db0b06d41e2d23d51e83f0b3b8e8caf4
nicolasroard [Tue, 19 Mar 2013 17:14:35 +0000 (17:14 +0000)]
am
efa57c3d: am
47dcc9c5: am
ff24fbbe: am
94202ecf: Improves double-tap and comparison mechanism
* commit '
efa57c3d87a4631b65b68f1ca2db44ff3c4a0e68':
Improves double-tap and comparison mechanism
nicolasroard [Tue, 19 Mar 2013 17:13:31 +0000 (17:13 +0000)]
am
47dcc9c5: am
ff24fbbe: am
94202ecf: Improves double-tap and comparison mechanism
* commit '
47dcc9c526aa001bce53c7ec00680ec052dc0806':
Improves double-tap and comparison mechanism
nicolasroard [Tue, 19 Mar 2013 17:11:22 +0000 (17:11 +0000)]
am
ff24fbbe: am
94202ecf: Improves double-tap and comparison mechanism
* commit '
ff24fbbe8d8a57bff85c48009faba567ce361808':
Improves double-tap and comparison mechanism
nicolasroard [Tue, 19 Mar 2013 17:08:22 +0000 (10:08 -0700)]
am
94202ecf: Improves double-tap and comparison mechanism
* commit '
94202ecf77d68ca7ed1b0adfe3b37daf6851e39d':
Improves double-tap and comparison mechanism
nicolasroard [Sat, 16 Mar 2013 21:27:22 +0000 (14:27 -0700)]
Improves double-tap and comparison mechanism
Change-Id: I1fda50d7d179703db9e0e525550018c259233e89
The Android Automerger [Tue, 19 Mar 2013 12:55:46 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ruben Brunk [Tue, 19 Mar 2013 07:10:34 +0000 (07:10 +0000)]
am
9b6aa4f2: am
387c7cee: am
c3b08ad7: am
f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after load.
* commit '
9b6aa4f2a117139f9475399c9ae60d549274b053':
ImageFilterRS filters reset properly. FilterPipeline delay till after load.
Ruben Brunk [Tue, 19 Mar 2013 07:09:17 +0000 (07:09 +0000)]
am
387c7cee: am
c3b08ad7: am
f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after load.
* commit '
387c7cee5f185d9a5372af04f80710a15a10c540':
ImageFilterRS filters reset properly. FilterPipeline delay till after load.
Ruben Brunk [Tue, 19 Mar 2013 07:08:00 +0000 (07:08 +0000)]
am
c3b08ad7: am
f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after load.
* commit '
c3b08ad78799de49294ae1a5f52e3cd90fb917d5':
ImageFilterRS filters reset properly. FilterPipeline delay till after load.
Ruben Brunk [Tue, 19 Mar 2013 07:06:21 +0000 (00:06 -0700)]
am
f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after load.
* commit '
f79f954f4eb23bce55061c683a07fc7b3a965451':
ImageFilterRS filters reset properly. FilterPipeline delay till after load.
Ruben Brunk [Tue, 19 Mar 2013 05:23:43 +0000 (22:23 -0700)]
ImageFilterRS filters reset properly. FilterPipeline delay till after load.
Bug:
8293404
Bug:
8417804
Change-Id: I4e3fbbdb86bcb790d73455f21044e6dee9398a5d
nicolasroard [Tue, 19 Mar 2013 03:52:48 +0000 (03:52 +0000)]
am
9f675f9a: am
762d8ab4: am
d2773420: am
b8270a94: Fix disappearing panels and animations on ICS
* commit '
9f675f9ac2a2b547bb4db61a33a61ac741e19130':
Fix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 03:51:30 +0000 (03:51 +0000)]
am
762d8ab4: am
d2773420: am
b8270a94: Fix disappearing panels and animations on ICS
* commit '
762d8ab4259e1f13f44c1cb542d2e275224266ad':
Fix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 03:48:48 +0000 (03:48 +0000)]
am
d2773420: am
b8270a94: Fix disappearing panels and animations on ICS
* commit '
d277342034a998e7f70fe07f655f55ef9fb38e4d':
Fix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 03:46:07 +0000 (20:46 -0700)]
am
b8270a94: Fix disappearing panels and animations on ICS
* commit '
b8270a94e539fc1944ae350c73b00b9df45832d5':
Fix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 00:27:55 +0000 (17:27 -0700)]
Fix disappearing panels and animations on ICS
bug:
8405402
Change-Id: I9c0da8fbf20c424cc64ae5cc1be42414cb2f0964
Bart Sears [Tue, 19 Mar 2013 03:02:47 +0000 (20:02 -0700)]
Bump up the version number to 1.1.40005
Change-Id: Ic01aa447fdae6628a84cd9d9561134c32c521df8
nicolasroard [Tue, 19 Mar 2013 01:58:25 +0000 (01:58 +0000)]
am
f00ddecc: am
83ee6b69: am
ac08be9e: am
783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
* commit '
f00ddecc9bacf7ffa1b3b5d8790a7818deb2d4c7':
Add nakasi resources. xhdpi resources are stripped...
nicolasroard [Tue, 19 Mar 2013 01:56:24 +0000 (01:56 +0000)]
am
83ee6b69: am
ac08be9e: am
783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
* commit '
83ee6b69fdb8cd7f9ff2b53e1bc12e61b4e946b9':
Add nakasi resources. xhdpi resources are stripped...
nicolasroard [Tue, 19 Mar 2013 00:43:13 +0000 (17:43 -0700)]
am
783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
* commit '
783a72dae8376fd73ea0c9972d8976909731321b':
Add nakasi resources. xhdpi resources are stripped...
nicolasroard [Mon, 18 Mar 2013 22:15:06 +0000 (15:15 -0700)]
am
3ccb0e3e: Add a cleanstep for the build server...
* commit '
3ccb0e3ef144ad54cc918779cc3ee10e7a182c28':
Add a cleanstep for the build server...
George Mount [Mon, 18 Mar 2013 18:35:51 +0000 (11:35 -0700)]
am
42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
* commit '
42559630d746e79fb139c65b2b12a35742eb0354':
Fix "drop table" problem.
nicolasroard [Tue, 19 Mar 2013 00:46:18 +0000 (00:46 +0000)]
am
ac08be9e: am
783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
* commit '
ac08be9e23c795ebe820650c528a3b10395f302c':
Add nakasi resources. xhdpi resources are stripped...
nicolasroard [Tue, 19 Mar 2013 00:43:13 +0000 (17:43 -0700)]
am
783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
* commit '
783a72dae8376fd73ea0c9972d8976909731321b':
Add nakasi resources. xhdpi resources are stripped...
nicolasroard [Tue, 19 Mar 2013 00:42:00 +0000 (00:42 +0000)]
Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
nicolasroard [Tue, 19 Mar 2013 00:36:41 +0000 (17:36 -0700)]
Add nakasi resources. xhdpi resources are stripped...
bug:
8410820
Change-Id: I8a5624e1285bfd0608890ea186859706fb9c241f
Baligh Uddin [Mon, 18 Mar 2013 23:17:07 +0000 (23:17 +0000)]
am
74eb2c17: (-s ours) am
93dd3b7d: (-s ours) am
91bbb6e0: am
cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
74eb2c17d14d676c0e76312a958607cc2071027e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 23:14:17 +0000 (23:14 +0000)]
am
93dd3b7d: (-s ours) am
91bbb6e0: am
cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
93dd3b7dab10c4b81e8745a18255ecae1e7ecc10':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 23:13:25 +0000 (23:13 +0000)]
am
a0031816: (-s ours) am
539ac3a2: (-s ours) am
fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
a003181618a8d2bf0f1a3e93a5daf627f164ae53':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 23:10:57 +0000 (23:10 +0000)]
am
539ac3a2: (-s ours) am
fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
539ac3a2f0602c40d0c016914ef66e91eec186b0':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 23:09:43 +0000 (23:09 +0000)]
am
91bbb6e0: am
cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
91bbb6e057c8cc7149f4554d3981386f83f99e54':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 23:06:24 +0000 (23:06 +0000)]
am
9307f52b: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
9307f52bdb35ab892b11f4e4faf4bcc526708118':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 23:06:22 +0000 (23:06 +0000)]
am
fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
fa248e482547e404cc696ec34171b30628036d19':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 23:05:30 +0000 (16:05 -0700)]
am
cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
cd7bd24d6d8a9c709beefe252e90f452caa4c2b6':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 23:04:29 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE" into master-security-dev
Baligh Uddin [Mon, 18 Mar 2013 23:04:15 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 18 Mar 2013 23:03:45 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 18 Mar 2013 23:03:30 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
John Reck [Mon, 18 Mar 2013 22:31:22 +0000 (22:31 +0000)]
am
d188cbac: am
040bc7f6: am
a885ea9e: am
75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce
* commit '
d188cbaccf1602735281b174b273cc5c3f5a96de':
Fix notifyChange
John Reck [Mon, 18 Mar 2013 22:28:48 +0000 (22:28 +0000)]
am
040bc7f6: am
a885ea9e: am
75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce
* commit '
040bc7f6f9871fdb47c75567dbc5eb4853ed2931':
Fix notifyChange
John Reck [Mon, 18 Mar 2013 22:26:29 +0000 (22:26 +0000)]
am
a885ea9e: am
75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce
* commit '
a885ea9e6ecec4d4fbc8d35b0792538dc564ed61':
Fix notifyChange
John Reck [Mon, 18 Mar 2013 22:24:13 +0000 (15:24 -0700)]
am
75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce
* commit '
75819cfec58ba48b5ee81eb9214c8e49dccfce76':
Fix notifyChange
John Reck [Mon, 18 Mar 2013 22:22:41 +0000 (22:22 +0000)]
Merge "Fix notifyChange" into gb-ub-photos-bryce
nicolasroard [Mon, 18 Mar 2013 22:21:47 +0000 (22:21 +0000)]
am
5eece6ed: am
d60a743e: am
57ee52de: am
3ccb0e3e: Add a cleanstep for the build server...
* commit '
5eece6edb14b6f5c3c77e08f660e1b87ff6ce27f':
Add a cleanstep for the build server...
nicolasroard [Mon, 18 Mar 2013 22:19:59 +0000 (22:19 +0000)]
am
d60a743e: am
57ee52de: am
3ccb0e3e: Add a cleanstep for the build server...
* commit '
d60a743ed63690cdaf789d782f9b7abc701aa264':
Add a cleanstep for the build server...
nicolasroard [Mon, 18 Mar 2013 22:18:03 +0000 (22:18 +0000)]
am
57ee52de: am
3ccb0e3e: Add a cleanstep for the build server...
* commit '
57ee52def2c9517e4d80342e770a9a9b6d858718':
Add a cleanstep for the build server...
nicolasroard [Mon, 18 Mar 2013 22:15:06 +0000 (15:15 -0700)]
am
3ccb0e3e: Add a cleanstep for the build server...
* commit '
3ccb0e3ef144ad54cc918779cc3ee10e7a182c28':
Add a cleanstep for the build server...
nicolasroard [Mon, 18 Mar 2013 22:10:52 +0000 (15:10 -0700)]
Add a cleanstep for the build server...
Change-Id: Ic882c28b33e04c346a1f326b1eb7cc10b870a8a3
John Reck [Mon, 18 Mar 2013 22:07:32 +0000 (15:07 -0700)]
Fix notifyChange
Change-Id: I48d6c756a5272465b6cfaa632c879683aa51083d
George Mount [Mon, 18 Mar 2013 21:50:28 +0000 (21:50 +0000)]
am
0284c097: am
b7238b6e: am
c113bbba: am
59073597: Merge "Change delete cascade" into gb-ub-photos-bryce
* commit '
0284c09778ac68e5cdb6bd4c3d95be9d3684a3a4':
Change delete cascade
George Mount [Mon, 18 Mar 2013 21:48:14 +0000 (21:48 +0000)]
am
b7238b6e: am
c113bbba: am
59073597: Merge "Change delete cascade" into gb-ub-photos-bryce
* commit '
b7238b6e17dad1a8d7acfb4e064e618b8c709210':
Change delete cascade
George Mount [Mon, 18 Mar 2013 21:46:33 +0000 (21:46 +0000)]
am
c113bbba: am
59073597: Merge "Change delete cascade" into gb-ub-photos-bryce
* commit '
c113bbba2d81111ef45f0e9010e8566043ea8712':
Change delete cascade
George Mount [Mon, 18 Mar 2013 21:43:49 +0000 (14:43 -0700)]
am
59073597: Merge "Change delete cascade" into gb-ub-photos-bryce
* commit '
59073597fe605a519a5f74f52d400b55d071de0d':
Change delete cascade
George Mount [Mon, 18 Mar 2013 21:42:10 +0000 (21:42 +0000)]
Merge "Change delete cascade" into gb-ub-photos-bryce
George Mount [Fri, 15 Mar 2013 14:31:35 +0000 (07:31 -0700)]
Change delete cascade
Change-Id: Ib40b0989ed437c923ff82b379e539b1141225529
Baligh Uddin [Mon, 18 Mar 2013 18:49:20 +0000 (11:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4fcdc2eeeec9b701d8ea0e447097b612ca81349
Auto-generated-cl: translation import
Baligh Uddin [Mon, 18 Mar 2013 18:48:39 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I748f8863dd8170df93915a9d4a233297a1d8baf7
Auto-generated-cl: translation import
Baligh Uddin [Mon, 18 Mar 2013 18:47:59 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4bfd0c303b8ebb6fd0e33582d4f91a76bb31fb60
Auto-generated-cl: translation import
Baligh Uddin [Mon, 18 Mar 2013 18:47:10 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ida36bea845582d04f3f8d8c8dea9576a6279be5e
Auto-generated-cl: translation import
George Mount [Mon, 18 Mar 2013 18:41:43 +0000 (18:41 +0000)]
am
35379c9c: am
d7f3fcb0: am
1199caa4: am
42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
* commit '
35379c9ce809e3e37180e342fcd2a947a667d378':
Fix "drop table" problem.
George Mount [Mon, 18 Mar 2013 18:39:31 +0000 (18:39 +0000)]
am
d7f3fcb0: am
1199caa4: am
42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
* commit '
d7f3fcb00226029abdf882f353ae42bbfeb218c0':
Fix "drop table" problem.
George Mount [Mon, 18 Mar 2013 18:38:26 +0000 (18:38 +0000)]
am
1199caa4: am
42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
* commit '
1199caa49792dd8047306008878168b7b3138344':
Fix "drop table" problem.
George Mount [Mon, 18 Mar 2013 18:35:51 +0000 (11:35 -0700)]
am
42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
* commit '
42559630d746e79fb139c65b2b12a35742eb0354':
Fix "drop table" problem.
Angus Kong [Mon, 18 Mar 2013 18:34:46 +0000 (18:34 +0000)]
am
04227cbd: am
0873c59c: am
e690d1a2: am
dc798933: Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce
* commit '
04227cbdbcb858be2aadf0610d3896a53c9ffdc9':
Add shared preference key of LightCycle.
George Mount [Mon, 18 Mar 2013 18:33:42 +0000 (18:33 +0000)]
Merge "Fix "drop table" problem." into gb-ub-photos-bryce
OSDN Git Service
