OSDN Git Service
The Android Open Source Project [Thu, 30 May 2013 21:24:14 +0000 (14:24 -0700)]
am
53c01796: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
53c017961c78d7ed9e95ec081cf821db2ba91745':
The Android Open Source Project [Thu, 30 May 2013 14:31:44 +0000 (07:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iafe6038c4a1cfd9f5fa19c0aa5697923ac7d3db8
The Android Automerger [Thu, 30 May 2013 12:55:54 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 22:30:24 +0000 (15:30 -0700)]
am
9695037c: (-s ours) am
cd9e75af: am
b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
9695037c72a8d291cf731e220acd3807c87e4fb1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 22:26:26 +0000 (15:26 -0700)]
am
cd9e75af: am
b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
cd9e75af015aa06d6e37a126d1ee92bfd63496dc':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 22:21:29 +0000 (15:21 -0700)]
am
ed6bb750: (-s ours) am
a7707160: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
ed6bb750c1662cff918d157b0ea3d2ce0c7e4108':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 22:18:35 +0000 (15:18 -0700)]
am
a7707160: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
a7707160ba8d9693ffdb813e0eb2cd3f15084a7f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 22:15:01 +0000 (15:15 -0700)]
am
b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
b375339072a32c57ebb06523abeaebd2db29dc08':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 20:49:55 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 29 May 2013 20:49:26 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 20:48:44 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
The Android Open Source Project [Wed, 29 May 2013 15:10:33 +0000 (08:10 -0700)]
am
a4a4e0b3: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a4a4e0b3cb74f6cea857ed2c8a4315e1ffc30bac':
The Android Open Source Project [Wed, 29 May 2013 15:06:12 +0000 (08:06 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2a6743d468c9daa2f59f5d249964bbe3abb274ca
The Android Automerger [Wed, 29 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Doris Liu [Tue, 28 May 2013 20:50:48 +0000 (13:50 -0700)]
am
9e11dddd: am
00d9601b: am
9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
* commit '
9e11dddd508dff7b8d24c56989d70c6ff67ca619':
Change the order of exposure compensation
Bobby Georgescu [Tue, 28 May 2013 20:50:46 +0000 (13:50 -0700)]
am
c4ef64c8: am
c1aaf4b5: am
e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
* commit '
c4ef64c8cc8ba7edc543f64efcb25c401cc94466':
Prevent lock screen appearing during active slideshow
The Android Open Source Project [Tue, 28 May 2013 20:50:18 +0000 (13:50 -0700)]
am
f6f4abec: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
f6f4abec09afda4d802ac0b7b2006d86a6161892':
Doris Liu [Tue, 28 May 2013 17:46:17 +0000 (10:46 -0700)]
am
00d9601b: am
9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
* commit '
00d9601b666106c3a1b60beb88639c70b8548ddc':
Change the order of exposure compensation
Doris Liu [Tue, 28 May 2013 17:45:17 +0000 (10:45 -0700)]
am
9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
* commit '
9fb962feb94909af05ab6cf872eee7e8928eb9b1':
Change the order of exposure compensation
Doris Liu [Tue, 28 May 2013 17:43:38 +0000 (17:43 +0000)]
Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 28 May 2013 17:17:48 +0000 (10:17 -0700)]
am
c1aaf4b5: am
e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
* commit '
c1aaf4b526507245428ef56a03727a5d0fb68659':
Prevent lock screen appearing during active slideshow
Bobby Georgescu [Tue, 28 May 2013 17:15:02 +0000 (10:15 -0700)]
am
e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
* commit '
e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
Prevent lock screen appearing during active slideshow
Bobby Georgescu [Tue, 28 May 2013 17:14:17 +0000 (17:14 +0000)]
Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
The Android Open Source Project [Tue, 28 May 2013 14:37:41 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia6906f2a43e04fae3489cc3d253fa6bc5dc175f4
Baligh Uddin [Mon, 27 May 2013 19:25:22 +0000 (12:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iec953ffc39f8ad12f2f18a3fdee49046f4753839
Auto-generated-cl: translation import
Baligh Uddin [Mon, 27 May 2013 19:24:49 +0000 (12:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I122eede49de1a919508911c5439529fdda40b203
Auto-generated-cl: translation import
Baligh Uddin [Mon, 27 May 2013 19:24:15 +0000 (12:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6d43e9331dd993de57921360e33c36a58c355056
Auto-generated-cl: translation import
The Android Automerger [Sun, 26 May 2013 12:55:36 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Bobby Georgescu [Fri, 24 May 2013 22:58:32 +0000 (15:58 -0700)]
Prevent lock screen appearing during active slideshow
Bug:
9094678
Change-Id: I8efb988911c75275430da934474df1e65265b234
Doris Liu [Fri, 24 May 2013 22:58:18 +0000 (15:58 -0700)]
Change the order of exposure compensation
Bug:
9119379
Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
Michael Kolb [Fri, 24 May 2013 20:02:15 +0000 (13:02 -0700)]
am
4f950b02: am
c4edd18d: am
461e101f: Add 13MP resolution
* commit '
4f950b02b321f6414dd9ad48b34560ee7f4e6b77':
Add 13MP resolution
Michael Kolb [Fri, 24 May 2013 19:27:31 +0000 (12:27 -0700)]
am
c4edd18d: am
461e101f: Add 13MP resolution
* commit '
c4edd18dcd6fa025a059b45e2f4c827569a24ac5':
Add 13MP resolution
Michael Kolb [Fri, 24 May 2013 19:25:17 +0000 (12:25 -0700)]
am
461e101f: Add 13MP resolution
* commit '
461e101fb99df1a704544efb29e56ece25788985':
Add 13MP resolution
Michael Kolb [Fri, 24 May 2013 16:44:00 +0000 (09:44 -0700)]
Add 13MP resolution
Bug:
9059351
Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
John Hoford [Thu, 23 May 2013 15:58:01 +0000 (08:58 -0700)]
am
0d2e0608: am
7b3d8d85: am
a7a6a3a5: Fix issues with Local
* commit '
0d2e0608cce21d4d80d6b0270af71f86b150294f':
Fix issues with Local
John Hoford [Thu, 23 May 2013 15:55:43 +0000 (08:55 -0700)]
am
7b3d8d85: am
a7a6a3a5: Fix issues with Local
* commit '
7b3d8d85e8602c0f6b43a13b3b0b1deccb8600cd':
Fix issues with Local
John Hoford [Thu, 23 May 2013 15:53:55 +0000 (08:53 -0700)]
am
a7a6a3a5: Fix issues with Local
* commit '
a7a6a3a5efaf62cdd5d562a9141678671952d27d':
Fix issues with Local
The Android Open Source Project [Thu, 23 May 2013 15:10:21 +0000 (08:10 -0700)]
am
edf16ad6: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
edf16ad654cbebd53ef7be0c585e0f1937340f06':
The Android Open Source Project [Thu, 23 May 2013 15:05:43 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I92222f8b210362d6a0bd2577216a5df5f822608a
The Android Automerger [Thu, 23 May 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
John Hoford [Wed, 22 May 2013 22:41:20 +0000 (15:41 -0700)]
Fix issues with Local
bug:
9085638
Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
John Hoford [Wed, 22 May 2013 20:14:42 +0000 (13:14 -0700)]
am
4eb1825c: am
3d4fbf40: am
4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
* commit '
4eb1825cb6c305f1c4479f55fac9047a4001b8e4':
fix ellipse logic for portrait
John Hoford [Wed, 22 May 2013 20:12:15 +0000 (13:12 -0700)]
am
3d4fbf40: am
4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
* commit '
3d4fbf40115389ed33487db2059048163c9afd1a':
fix ellipse logic for portrait
John Hoford [Wed, 22 May 2013 20:09:16 +0000 (13:09 -0700)]
am
4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
* commit '
4d25d129d1c9f92033382e12260d3f40521cf3fd':
fix ellipse logic for portrait
John Hoford [Wed, 22 May 2013 20:08:26 +0000 (20:08 +0000)]
Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 22 May 2013 18:19:09 +0000 (11:19 -0700)]
am
e3ea0548: am
410635e7: am
cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
* commit '
e3ea05489d870d9fb0c6c45401e01a07c7b90b4c':
Fix potential synchronization issue in bitmap pool
Bobby Georgescu [Wed, 22 May 2013 18:16:48 +0000 (11:16 -0700)]
am
410635e7: am
cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
* commit '
410635e7f8df429fcecc328bf6191b053b989004':
Fix potential synchronization issue in bitmap pool
Bobby Georgescu [Wed, 22 May 2013 18:12:39 +0000 (11:12 -0700)]
am
cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
* commit '
cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9':
Fix potential synchronization issue in bitmap pool
Bobby Georgescu [Wed, 22 May 2013 18:11:25 +0000 (18:11 +0000)]
Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
Michael Kolb [Wed, 22 May 2013 17:01:14 +0000 (10:01 -0700)]
Michael Kolb [Wed, 22 May 2013 16:59:39 +0000 (09:59 -0700)]
am
02593125: am
be4f113f: Fix editor on ICS
* commit '
0259312504eddbae2f29a1d8a09892fb0e95d8c8':
Fix editor on ICS
Michael Kolb [Wed, 22 May 2013 16:57:21 +0000 (09:57 -0700)]
am
be4f113f: Fix editor on ICS
* commit '
be4f113fa1fea32e8d8865a52491b9f25760eaba':
Fix editor on ICS
Michael Kolb [Wed, 22 May 2013 16:06:20 +0000 (09:06 -0700)]
Fix editor on ICS
Bug:
9079902
Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14
The Android Open Source Project [Wed, 22 May 2013 14:27:41 +0000 (07:27 -0700)]
am
cac59514: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
cac5951436f3cff8b0e634b52633b193e139c135':
The Android Open Source Project [Wed, 22 May 2013 14:23:04 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I7100dae7ada8486be79bec2166bf9b8f81cf9e34
The Android Automerger [Wed, 22 May 2013 12:55:31 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
John Hoford [Wed, 22 May 2013 00:11:05 +0000 (17:11 -0700)]
fix ellipse logic for portrait
bug:
9054114
Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec
Michael Kolb [Tue, 21 May 2013 23:17:31 +0000 (16:17 -0700)]
am
28d3467e: am
7da344a4: am
37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
* commit '
28d3467e5dbad9e21e7a7695a15faedea5e9c8ef':
Fix selection highlight for tablets
Michael Kolb [Tue, 21 May 2013 23:12:27 +0000 (16:12 -0700)]
am
7da344a4: am
37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
* commit '
7da344a46f348a5bc9ac958ccf7186b4f7d1c899':
Fix selection highlight for tablets
Michael Kolb [Tue, 21 May 2013 23:10:57 +0000 (16:10 -0700)]
am
37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
* commit '
37be6658075cac2bad0e30d93705dddeaaf1e421':
Fix selection highlight for tablets
Michael Kolb [Tue, 21 May 2013 23:09:18 +0000 (23:09 +0000)]
Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
John Reck [Tue, 21 May 2013 23:04:09 +0000 (16:04 -0700)]
am
a4a09f9c: am
550eefae: am
01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
* commit '
a4a09f9c0d73876a92c4fddbbd5086fa21899af2':
Fix height
John Reck [Tue, 21 May 2013 23:01:26 +0000 (16:01 -0700)]
am
550eefae: am
01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
* commit '
550eefae642049dea0023168643b54d1c7a73b8e':
Fix height
John Reck [Tue, 21 May 2013 22:57:48 +0000 (15:57 -0700)]
am
01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
* commit '
01ae91aa0e347c5a8b335afc8cb0f02459ee5adc':
Fix height
John Reck [Tue, 21 May 2013 22:55:16 +0000 (22:55 +0000)]
Merge "Fix height" into gb-ub-photos-bryce
Sascha Haeberling [Tue, 21 May 2013 22:48:00 +0000 (15:48 -0700)]
am
103b2429: am
0cf42d07: am
80a3d636: Make capture thumbnail tappable in video mode.
* commit '
103b2429c1840ed85dddef636bc7c6ffd03deea2':
Make capture thumbnail tappable in video mode.
Sascha Haeberling [Tue, 21 May 2013 22:46:14 +0000 (15:46 -0700)]
am
0cf42d07: am
80a3d636: Make capture thumbnail tappable in video mode.
* commit '
0cf42d07132b27aa1f50707fbf5aa30fde925cbf':
Make capture thumbnail tappable in video mode.
Sascha Haeberling [Tue, 21 May 2013 22:43:32 +0000 (15:43 -0700)]
am
80a3d636: Make capture thumbnail tappable in video mode.
* commit '
80a3d636fa38bb78dbc9f224b4944a21a6e3271d':
Make capture thumbnail tappable in video mode.
John Reck [Mon, 20 May 2013 21:45:14 +0000 (14:45 -0700)]
Fix height
Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
Michael Kolb [Tue, 21 May 2013 22:10:51 +0000 (15:10 -0700)]
Fix selection highlight for tablets
Bug:
9044356
Fixes selection highlight for the new asset sizes.
Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a
Sascha Haeberling [Tue, 21 May 2013 18:26:13 +0000 (11:26 -0700)]
Make capture thumbnail tappable in video mode.
Bug:
9054122
Also make gotoGallery public for LightCycle to use.
Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc
Bobby Georgescu [Tue, 21 May 2013 20:42:09 +0000 (13:42 -0700)]
Fix potential synchronization issue in bitmap pool
Bug:
9072712
Change-Id: I7fcecd6ec63e461e06a6565519be6d86e3246155
Doris Liu [Tue, 21 May 2013 17:21:02 +0000 (10:21 -0700)]
am
ef2d4a1d: am
bfce0515: am
aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
* commit '
ef2d4a1d0fd6b2676c5b650dfbdba07b99528328':
Fix camera controls blink on startup
Doris Liu [Tue, 21 May 2013 17:17:44 +0000 (10:17 -0700)]
am
bfce0515: am
aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
* commit '
bfce0515165aa381b730b4dd772132c41dea4e28':
Fix camera controls blink on startup
Doris Liu [Tue, 21 May 2013 17:14:11 +0000 (10:14 -0700)]
am
aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
* commit '
aa77f39a3a18ee7945177189c358ef6208e6da2b':
Fix camera controls blink on startup
Doris Liu [Tue, 21 May 2013 17:12:03 +0000 (17:12 +0000)]
Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
John Hoford [Tue, 21 May 2013 16:15:00 +0000 (09:15 -0700)]
am
a8d103b4: am
c6038e29: am
a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
* commit '
a8d103b48174c9313aed9e4db026c1c19d7dd56c':
fix TinyPlanets Filter landscape crash
John Hoford [Tue, 21 May 2013 16:12:25 +0000 (09:12 -0700)]
am
c6038e29: am
a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
* commit '
c6038e29aea5012a8c342d1a4c72aa26a9895519':
fix TinyPlanets Filter landscape crash
John Hoford [Tue, 21 May 2013 16:10:59 +0000 (09:10 -0700)]
am
a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
* commit '
a285bc130ff1175c60085410f317e90f6443c39b':
fix TinyPlanets Filter landscape crash
John Hoford [Tue, 21 May 2013 16:09:17 +0000 (16:09 +0000)]
Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
The Android Open Source Project [Tue, 21 May 2013 16:06:31 +0000 (09:06 -0700)]
am
7b2f0b93: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
7b2f0b93fc5f6299511125e509560ac49f90e79a':
The Android Open Source Project [Tue, 21 May 2013 16:01:56 +0000 (09:01 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I51461342bc651cb4e82db8a6a117d00a1017f4d9
Bart Sears [Tue, 21 May 2013 15:59:00 +0000 (08:59 -0700)]
am
7ddebfad: am
1998968a: am
a83166df: Bump up the version number to 1.1.40012
* commit '
7ddebfad20c3ad136f42f80a2dc44c92b9b4b71a':
Bump up the version number to 1.1.40012
Bart Sears [Tue, 21 May 2013 15:57:28 +0000 (08:57 -0700)]
am
1998968a: am
a83166df: Bump up the version number to 1.1.40012
* commit '
1998968a17c490276ffc46c7466401011109063b':
Bump up the version number to 1.1.40012
Bart Sears [Tue, 21 May 2013 15:55:47 +0000 (08:55 -0700)]
am
a83166df: Bump up the version number to 1.1.40012
* commit '
a83166dfc97c6d45b03728a2ae32b085e91b8d0c':
Bump up the version number to 1.1.40012
The Android Automerger [Tue, 21 May 2013 14:46:56 +0000 (07:46 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
John Hoford [Tue, 21 May 2013 01:24:12 +0000 (18:24 -0700)]
fix TinyPlanets Filter landscape crash
bug:
9038163
Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
Bart Sears [Mon, 20 May 2013 22:59:20 +0000 (15:59 -0700)]
Bump up the version number to 1.1.40012
Bug:
8607157
Change-Id: I5fdf05fd4d10a54f72129177572285d438740b97
Doris Liu [Mon, 20 May 2013 22:21:05 +0000 (15:21 -0700)]
Fix camera controls blink on startup
Bug:
9052837
Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
Ruben Brunk [Mon, 20 May 2013 21:29:39 +0000 (14:29 -0700)]
am
e28b45f0: am
96c48dee: am
286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
* commit '
e28b45f0372195330237d8f30607b19b9b817c05':
Avoid using region decoder for bad image types when setting wallpaper.
Ruben Brunk [Mon, 20 May 2013 21:27:40 +0000 (14:27 -0700)]
am
96c48dee: am
286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
* commit '
96c48dee541fae960c23234a71d0f287e0e13489':
Avoid using region decoder for bad image types when setting wallpaper.
Ruben Brunk [Mon, 20 May 2013 21:23:34 +0000 (14:23 -0700)]
am
286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
* commit '
286afab10fb4c528ea503981c4f1bdbcfbdbde77':
Avoid using region decoder for bad image types when setting wallpaper.
Ruben Brunk [Mon, 20 May 2013 21:22:09 +0000 (21:22 +0000)]
Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
Sascha Haeberling [Mon, 20 May 2013 21:13:26 +0000 (14:13 -0700)]
am
4925d799: am
f2697daa: am
7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
* commit '
4925d79902524b506c04aa769c6aa3788a7be2d0':
Make sure canceling a filter does not undo previous filter.
Sascha Haeberling [Mon, 20 May 2013 21:11:35 +0000 (14:11 -0700)]
am
f2697daa: am
7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
* commit '
f2697daa3a5f114216488022ca513cb7811075b9':
Make sure canceling a filter does not undo previous filter.
Sascha Haeberling [Mon, 20 May 2013 21:09:27 +0000 (14:09 -0700)]
am
7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
* commit '
7af7156a809934951877b1f9b9ad1ceeb9c9a5ce':
Make sure canceling a filter does not undo previous filter.
Sascha Haeberling [Mon, 20 May 2013 21:07:00 +0000 (21:07 +0000)]
Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
Ruben Brunk [Mon, 20 May 2013 18:34:24 +0000 (11:34 -0700)]
Avoid using region decoder for bad image types when setting wallpaper.
Bug:
8893617
Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe
The Android Open Source Project [Mon, 20 May 2013 15:26:24 +0000 (08:26 -0700)]
am
706ed7eb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
706ed7ebf21b5936b2d5b908a239be3e05160518':
The Android Open Source Project [Mon, 20 May 2013 15:20:36 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I326060063e4586e6bfa9edafc93b26a89a47a7b7
OSDN Git Service
