OSDN Git Service
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
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
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: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: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: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: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 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: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: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: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: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: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: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:01:56 +0000 (09:01 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I51461342bc651cb4e82db8a6a117d00a1017f4d9
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: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: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:20:36 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I326060063e4586e6bfa9edafc93b26a89a47a7b7
John Hoford [Mon, 20 May 2013 14:45:30 +0000 (07:45 -0700)]
am
22fcfeb2: am
26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce
* commit '
22fcfeb20d601ca73dcfa374a46d3b370bef1929':
Disable zoom
John Hoford [Mon, 20 May 2013 14:44:09 +0000 (07:44 -0700)]
am
26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce
* commit '
26e3c48b831e39ced1db18673f12fb3c7a2d56d8':
Disable zoom
John Hoford [Mon, 20 May 2013 14:42:44 +0000 (14:42 +0000)]
Merge "Disable zoom" into gb-ub-photos-bryce
The Android Automerger [Sun, 19 May 2013 12:55:36 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
John Hoford [Fri, 17 May 2013 00:37:46 +0000 (17:37 -0700)]
Disable zoom
Bug:
8791729
Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
Baligh Uddin [Fri, 17 May 2013 22:52:21 +0000 (15:52 -0700)]
am
5ba97880: am
082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
5ba9788055cce978a82a96367625b671471a86f4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 22:52:20 +0000 (15:52 -0700)]
am
2e4c852c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
2e4c852c525ceceb7176f61e1d94a4fed9b29d15':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 22:51:00 +0000 (15:51 -0700)]
am
082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
082541a730e56092b948580a8e8040be78979e23':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 22:50:11 +0000 (22:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 17 May 2013 22:49:53 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Michael Kolb [Fri, 17 May 2013 22:39:53 +0000 (15:39 -0700)]
am
cf4b66a9: am
1a266f16: Highlight selected option in FX and Borders
* commit '
cf4b66a9a4d794d93c75798fab81fad006897167':
Highlight selected option in FX and Borders
Michael Kolb [Fri, 17 May 2013 22:36:52 +0000 (15:36 -0700)]
am
1a266f16: Highlight selected option in FX and Borders
* commit '
1a266f16edbef7cb0a770d37fcad958fc55a5862':
Highlight selected option in FX and Borders
Michael Kolb [Fri, 17 May 2013 16:09:21 +0000 (09:09 -0700)]
Highlight selected option in FX and Borders
Bug:
8791729
Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
The Android Open Source Project [Fri, 17 May 2013 19:54:44 +0000 (12:54 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6c8f974fdf7022bfe1cc0ca00a3cf1466d641428
Baligh Uddin [Fri, 17 May 2013 19:42:25 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0c282e8a46050eb587fc120334eb2ef21bc2b15e
Auto-generated-cl: translation import
Baligh Uddin [Fri, 17 May 2013 19:41:48 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a5fee30a1f76b360c7ffca2ffec7592a66d7e52
Auto-generated-cl: translation import
John Reck [Thu, 16 May 2013 23:00:50 +0000 (16:00 -0700)]
am
8d07b582: am
3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce
* commit '
8d07b582341df0262eda91da7fbed5938bdd2337':
Switch back to old crop
John Reck [Thu, 16 May 2013 22:59:23 +0000 (15:59 -0700)]
am
3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce
* commit '
3b7347daf572c20996607afe4cc32f9a96f8fe5d':
Switch back to old crop
John Reck [Thu, 16 May 2013 22:58:09 +0000 (22:58 +0000)]
Merge "Switch back to old crop" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 22:18:50 +0000 (15:18 -0700)]
Switch back to old crop
Bug:
8950255
Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed
Michael Kolb [Thu, 16 May 2013 21:34:01 +0000 (14:34 -0700)]
am
1420dea3: am
5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
* commit '
1420dea329586ad491ea93a90a59d0d78b28d953':
Add new overlay icons for sharpen and curves
Michael Kolb [Thu, 16 May 2013 21:32:42 +0000 (14:32 -0700)]
am
5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
* commit '
5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca':
Add new overlay icons for sharpen and curves
Michael Kolb [Thu, 16 May 2013 21:31:31 +0000 (21:31 +0000)]
Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
Michael Kolb [Thu, 16 May 2013 21:07:29 +0000 (14:07 -0700)]
Add new overlay icons for sharpen and curves
Bug:
8791729
Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b
John Reck [Thu, 16 May 2013 21:02:47 +0000 (14:02 -0700)]
am
5c95e49f: am
75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce
* commit '
5c95e49faad25acca47639ed97ada8b50567793e':
toUpper() some strings
John Reck [Thu, 16 May 2013 20:59:20 +0000 (13:59 -0700)]
am
80835b0a: am
5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce
* commit '
80835b0aa14ad477adf3f23b69b2bf7c83fe0c20':
Fix reset
John Reck [Thu, 16 May 2013 20:58:02 +0000 (13:58 -0700)]
am
75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce
* commit '
75084da1b34e0ff9f269b5409d206c213532edbc':
toUpper() some strings
John Reck [Thu, 16 May 2013 20:56:29 +0000 (20:56 +0000)]
Merge "toUpper() some strings" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 20:54:50 +0000 (13:54 -0700)]
am
5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce
* commit '
5a9716fe6de7af4585a24dd1d749b38a4ab48195':
Fix reset
John Reck [Thu, 16 May 2013 20:52:31 +0000 (20:52 +0000)]
Merge "Fix reset" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 20:50:50 +0000 (13:50 -0700)]
toUpper() some strings
Bug:
8791729
Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
John Hoford [Thu, 16 May 2013 20:48:04 +0000 (13:48 -0700)]
am
c792b72a: am
fef58a0f: change edit icon
* commit '
c792b72a0b2394cdd8648ad867a0a36f0ad937f4':
change edit icon
John Hoford [Thu, 16 May 2013 20:46:27 +0000 (13:46 -0700)]
am
fef58a0f: change edit icon
* commit '
fef58a0fc969cc09b02cb9945da8d553698681e3':
change edit icon
John Hoford [Thu, 16 May 2013 19:55:21 +0000 (12:55 -0700)]
change edit icon
bug:
8988179
Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0
The Android Automerger [Thu, 16 May 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 16 May 2013 12:44:03 +0000 (05:44 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I232af0988b3526fbc5d309397c361556fb7b09e7
John Reck [Wed, 15 May 2013 21:45:34 +0000 (14:45 -0700)]
Fix reset
Bug:
8791729
Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec
Michael Kolb [Wed, 15 May 2013 20:35:17 +0000 (13:35 -0700)]
am
f8d78d2f: am
c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
* commit '
f8d78d2fda5b706e5932f8d428f6316f4e68a32a':
Grey out undo/redo/reset according to state
Michael Kolb [Wed, 15 May 2013 20:35:16 +0000 (13:35 -0700)]
am
da046959: am
655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce
* commit '
da046959e0b990e532e774779c50b2b5c1d7a785':
Correct label position after rotation
ztenghui [Wed, 15 May 2013 20:34:58 +0000 (13:34 -0700)]
am
0e0644ad: am
4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
* commit '
0e0644ad8538253bfb0e07bdafaa2dacba6c6a56':
Fix another annoying warning log spam
Michael Kolb [Wed, 15 May 2013 18:57:37 +0000 (11:57 -0700)]
am
c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
* commit '
c2f813a36711742af3b23743ef1849cec13a9a95':
Grey out undo/redo/reset according to state
Michael Kolb [Wed, 15 May 2013 18:57:36 +0000 (11:57 -0700)]
am
655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce
* commit '
655e208d5dc1305d9e4eb5301dec0673136151c9':
Correct label position after rotation
Michael Kolb [Wed, 15 May 2013 18:55:19 +0000 (18:55 +0000)]
Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
Michael Kolb [Wed, 15 May 2013 18:55:08 +0000 (18:55 +0000)]
Merge "Correct label position after rotation" into gb-ub-photos-bryce
ztenghui [Wed, 15 May 2013 17:37:57 +0000 (10:37 -0700)]
am
4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
* commit '
4aa8d5fc9d3478d511786cb99d5ba704d3e1f426':
Fix another annoying warning log spam
OSDN Git Service
