OSDN Git Service
John Hoford [Wed, 25 Sep 2013 21:11:04 +0000 (14:11 -0700)]
am
14b2d1d8: am
c0b8a86e: Merge "fix layout issues with border" into gb-ub-photos-carlsbad
* commit '
14b2d1d83c22cf9f24d0709f7c8a8806329a2846':
fix layout issues with border
John Hoford [Wed, 25 Sep 2013 21:07:58 +0000 (14:07 -0700)]
am
c0b8a86e: Merge "fix layout issues with border" into gb-ub-photos-carlsbad
* commit '
c0b8a86ec7cb9b54053ca5cb38716a73d1ba171c':
fix layout issues with border
John Hoford [Wed, 25 Sep 2013 21:06:18 +0000 (21:06 +0000)]
Merge "fix layout issues with border" into gb-ub-photos-carlsbad
Mindy Pereira [Wed, 25 Sep 2013 20:21:07 +0000 (13:21 -0700)]
Mindy Pereira [Wed, 25 Sep 2013 20:16:05 +0000 (13:16 -0700)]
am
75bfc8da: De-blue gallery
* commit '
75bfc8da0bc1e38144c782df0114def96f8534e8':
De-blue gallery
Baligh Uddin [Wed, 25 Sep 2013 20:01:53 +0000 (13:01 -0700)]
am
ae982f9b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ae982f9b02b0d8c34188cdc4bc8183e511c10cbf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 20:01:52 +0000 (13:01 -0700)]
am
13f285aa: (-s ours) Import translations. DO NOT MERGE
* commit '
13f285aab9424ae07b936012ffc6ef9bcdca7f36':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 19:59:36 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Mindy Pereira [Tue, 24 Sep 2013 16:08:06 +0000 (09:08 -0700)]
De-blue gallery
fixes b/
10914665 de-blue gallery
remaining issue was pressed state of images
Change-Id: Ib340d29867153925ae37da55d5c49cdb97f5d51b
Baligh Uddin [Wed, 25 Sep 2013 17:08:44 +0000 (10:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I988057d68d772903f4a4a209df86a08a03efcb5f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Sep 2013 17:07:01 +0000 (10:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc67506d99bd48d59f37a7d903521c489b731be0
Auto-generated-cl: translation import
Kevin Gabayan [Wed, 25 Sep 2013 01:38:34 +0000 (18:38 -0700)]
am
6846ac15: am
6053762e: Merge "Remove unused assets in Gallery2." into gb-ub-photos-carlsbad
* commit '
6846ac15bf2a0a9d3473b5a35ac3c984a318ebd1':
Remove unused assets in Gallery2.
Kevin Gabayan [Wed, 25 Sep 2013 01:36:15 +0000 (18:36 -0700)]
am
6053762e: Merge "Remove unused assets in Gallery2." into gb-ub-photos-carlsbad
* commit '
6053762eb9686cf73a32311db46ba51ebcba8db8':
Remove unused assets in Gallery2.
Kevin Gabayan [Wed, 25 Sep 2013 01:34:17 +0000 (01:34 +0000)]
Merge "Remove unused assets in Gallery2." into gb-ub-photos-carlsbad
John Hoford [Tue, 24 Sep 2013 23:55:58 +0000 (16:55 -0700)]
fix layout issues with border
Change-Id: I92e7a86524a40f379eaa39af4b56500c33e97423
nicolasroard [Tue, 24 Sep 2013 23:53:15 +0000 (16:53 -0700)]
am
b1f68393: am
15152c9e: Merge "Fix color panel bgd color" into gb-ub-photos-carlsbad
* commit '
b1f68393c96fbeb9f2cc1b54bae4579b18ebcf7b':
Fix color panel bgd color
nicolasroard [Tue, 24 Sep 2013 23:48:28 +0000 (16:48 -0700)]
am
15152c9e: Merge "Fix color panel bgd color" into gb-ub-photos-carlsbad
* commit '
15152c9eec2a110e8ae459b756e694690ad6aca5':
Fix color panel bgd color
nicolasroard [Tue, 24 Sep 2013 23:45:31 +0000 (23:45 +0000)]
Merge "Fix color panel bgd color" into gb-ub-photos-carlsbad
John Hoford [Tue, 24 Sep 2013 23:36:35 +0000 (16:36 -0700)]
am
62ff5222: am
59e93986: Merge "fix print code to support landscape" into gb-ub-photos-carlsbad
* commit '
62ff5222af31de3757a9ad5428f68d0e338ae060':
fix print code to support landscape
John Hoford [Tue, 24 Sep 2013 23:34:18 +0000 (16:34 -0700)]
am
59e93986: Merge "fix print code to support landscape" into gb-ub-photos-carlsbad
* commit '
59e93986efb957b361a03ad08033f169c958a184':
fix print code to support landscape
John Hoford [Tue, 24 Sep 2013 23:31:43 +0000 (23:31 +0000)]
Merge "fix print code to support landscape" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 23:25:43 +0000 (16:25 -0700)]
Fix color panel bgd color
Change-Id: I60b62e520a93b0432eacbf1517f26ae5597bb05d
John Hoford [Tue, 24 Sep 2013 22:14:48 +0000 (15:14 -0700)]
fix print code to support landscape
Change-Id: Ied569232a55ba953da59eeee2c13fc4608430a2d
Baligh Uddin [Tue, 24 Sep 2013 22:04:06 +0000 (15:04 -0700)]
am
7d17baf9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7d17baf9e86aa4db8635526e0deaa78ad2d5e6a5':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 24 Sep 2013 22:04:04 +0000 (15:04 -0700)]
am
b94bb276: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b94bb2765a921f2ad80123d18558a90f9dc643e3':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 24 Sep 2013 22:00:20 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 24 Sep 2013 21:57:31 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
nicolasroard [Tue, 24 Sep 2013 21:37:29 +0000 (14:37 -0700)]
am
c6e44c1d: am
b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad
* commit '
c6e44c1dba6fdd74d1fe9c23722d7311fb2f9124':
Fix style for crop activity
Mindy Pereira [Tue, 24 Sep 2013 21:37:27 +0000 (14:37 -0700)]
nicolasroard [Tue, 24 Sep 2013 21:34:24 +0000 (14:34 -0700)]
am
b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad
* commit '
b6b1d176fb50047a1590f5c601b0c54a6b1db6f8':
Fix style for crop activity
nicolasroard [Tue, 24 Sep 2013 21:31:51 +0000 (21:31 +0000)]
Merge "Fix style for crop activity" into gb-ub-photos-carlsbad
Mindy Pereira [Tue, 24 Sep 2013 21:31:12 +0000 (14:31 -0700)]
am
2aed1baf: De-blue gallery
* commit '
2aed1baf6ea4afa7a78ea24ee822a95d75534b8b':
De-blue gallery
nicolasroard [Tue, 24 Sep 2013 21:20:04 +0000 (14:20 -0700)]
Fix style for crop activity
bug:
10786662
Change-Id: Ie104b8ba2484455ad5cdf90d8c26157480143b0b
Mindy Pereira [Tue, 24 Sep 2013 16:08:06 +0000 (09:08 -0700)]
De-blue gallery
fixes b/
10914665 de-blue gallery
Change-Id: I961d5792a9e1a0187581439fa58e237b4ddeba5b
nicolasroard [Tue, 24 Sep 2013 06:40:19 +0000 (23:40 -0700)]
am
357df0a1: am
1a65cb12: Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad
* commit '
357df0a1e1f53ad7975e728d8542397f5d004807':
Limit string to 25 characters
nicolasroard [Tue, 24 Sep 2013 06:37:28 +0000 (23:37 -0700)]
am
1a65cb12: Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad
* commit '
1a65cb127c8002d8be57e767147d86bd131c556c':
Limit string to 25 characters
nicolasroard [Tue, 24 Sep 2013 06:36:58 +0000 (23:36 -0700)]
am
df392823: am
8db4f458: Fix export dialog UI
* commit '
df392823679bd52e57ecad3f2f764981510e6fee':
Fix export dialog UI
nicolasroard [Tue, 24 Sep 2013 06:34:19 +0000 (06:34 +0000)]
Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 06:34:19 +0000 (23:34 -0700)]
am
8db4f458: Fix export dialog UI
* commit '
8db4f458ac9d28a508471dfb874abbe170a5ac23':
Fix export dialog UI
nicolasroard [Tue, 24 Sep 2013 06:30:36 +0000 (23:30 -0700)]
Limit string to 25 characters
bug:
10889576
Change-Id: Ib314b84d8def7dc1300fc738a1a461d37549d6e1
nicolasroard [Tue, 24 Sep 2013 06:29:28 +0000 (23:29 -0700)]
am
508a14fe: am
d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
* commit '
508a14fee906506805057c8c4e5ad670dda2cc6f':
Fix crash in caching pipeline
nicolasroard [Tue, 24 Sep 2013 06:29:27 +0000 (23:29 -0700)]
am
b920df87: am
26f23e62: Fix crashes after switching languages
* commit '
b920df87814fd664db44391f1c50488c99a1b4cb':
Fix crashes after switching languages
nicolasroard [Tue, 24 Sep 2013 06:28:11 +0000 (23:28 -0700)]
am
d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
* commit '
d04aaf626da8aea7f8f18341499e0b51a60e4d32':
Fix crash in caching pipeline
nicolasroard [Tue, 24 Sep 2013 06:28:10 +0000 (23:28 -0700)]
am
26f23e62: Fix crashes after switching languages
* commit '
26f23e62096eb50344815e1b066e9a1efb629bb0':
Fix crashes after switching languages
nicolasroard [Tue, 24 Sep 2013 02:26:20 +0000 (19:26 -0700)]
Fix export dialog UI
bug:
10889576
bug:
10712083
Change-Id: I7921c06365775625a85e3d0a997d844c42586b01
nicolasroard [Tue, 24 Sep 2013 06:26:27 +0000 (06:26 +0000)]
Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 04:42:02 +0000 (21:42 -0700)]
Fix crash in caching pipeline
Geometry filters wrongly collapsed with other filters
bug:
10903204
Change-Id: Iaee3082e605f4cdaba236df014fb41a4975d05d6
nicolasroard [Tue, 24 Sep 2013 02:00:36 +0000 (19:00 -0700)]
am
95d3f081: am
105fbcf3: Fix issues with RTL support
* commit '
95d3f0817c04b0ed08c41856dc92e27db552115b':
Fix issues with RTL support
nicolasroard [Tue, 24 Sep 2013 01:59:50 +0000 (18:59 -0700)]
am
5a03286c: am
eccdc428: Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
* commit '
5a03286c355d73a24be4194e54accc46f67b8c2d':
Fix animation in tablet
Mangesh Ghiware [Tue, 24 Sep 2013 01:59:20 +0000 (18:59 -0700)]
am
98205f6c: am
889b1b25: Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
* commit '
98205f6c1b642e3b4572e1c7ebf1184bfa81b2af':
Add (back) receiver to disable camera.
nicolasroard [Tue, 24 Sep 2013 01:59:17 +0000 (18:59 -0700)]
Svetoslav Ganov [Tue, 24 Sep 2013 01:59:15 +0000 (18:59 -0700)]
am
a88be532: am
3dcb77a2: Update Gallery due to API changes.
* commit '
a88be532a45b09855be6d5ffec6a1b3ea0b3efc0':
Update Gallery due to API changes.
nicolasroard [Tue, 24 Sep 2013 01:36:25 +0000 (18:36 -0700)]
Fix crashes after switching languages
bug:
8148068
Change-Id: Icb23c8b221e52fe26981887a0af9857f3d58bf79
Kevin Gabayan [Tue, 24 Sep 2013 00:45:48 +0000 (17:45 -0700)]
Remove unused assets in Gallery2.
Bug:
10493013
Change-Id: I380ab6609b6a606ee5a3e9e13c8272a4e5c20cbe
nicolasroard [Mon, 23 Sep 2013 23:21:32 +0000 (16:21 -0700)]
am
105fbcf3: Fix issues with RTL support
* commit '
105fbcf3289491aa4f590057e304fee33f1c88ca':
Fix issues with RTL support
nicolasroard [Mon, 23 Sep 2013 23:12:10 +0000 (16:12 -0700)]
Fix issues with RTL support
bug:
8148068
Change-Id: I869e1a90686c46f8076a66f94040ad03c7c6ca10
Baligh Uddin [Mon, 23 Sep 2013 21:24:40 +0000 (14:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7cfedb32eb13682f0ac8353b9040519ba9b3c242
Auto-generated-cl: translation import
Baligh Uddin [Mon, 23 Sep 2013 21:17:52 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I719035e302198e02614d075af433a5bf94a7abda
Auto-generated-cl: translation import
nicolasroard [Mon, 23 Sep 2013 20:51:12 +0000 (13:51 -0700)]
am
eccdc428: Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
* commit '
eccdc4285476c98bff3dc5bde113b7f855b18346':
Fix animation in tablet
nicolasroard [Mon, 23 Sep 2013 20:48:12 +0000 (20:48 +0000)]
Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
nicolasroard [Mon, 23 Sep 2013 20:43:23 +0000 (13:43 -0700)]
Fix animation in tablet
- fix anim in tablet
- fix double-tap timings
- re-add draw in AOSP
Change-Id: I53be8f348ed7927812afa8a4ba84841e4b9d3f4f
Mangesh Ghiware [Mon, 23 Sep 2013 18:37:50 +0000 (11:37 -0700)]
am
889b1b25: Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
* commit '
889b1b25b9928624ea1ca51cba51642d5cf4044d':
Add (back) receiver to disable camera.
Mangesh Ghiware [Mon, 23 Sep 2013 18:34:52 +0000 (18:34 +0000)]
Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
nicolasroard [Mon, 23 Sep 2013 18:34:25 +0000 (11:34 -0700)]
nicolasroard [Sat, 21 Sep 2013 02:00:33 +0000 (19:00 -0700)]
Fix reset
bug:
10788166
Change-Id: I989c2caef8ccf4ff7ca84545aed35941248f8034
Svetoslav Ganov [Mon, 23 Sep 2013 18:30:11 +0000 (11:30 -0700)]
am
3dcb77a2: Update Gallery due to API changes.
* commit '
3dcb77a23d80046aa0c9af9ec32394432031d417':
Update Gallery due to API changes.
Svetoslav Ganov [Thu, 19 Sep 2013 17:04:54 +0000 (10:04 -0700)]
Update Gallery due to API changes.
bug:
10461180
Change-Id: I1c92871ef97b61920410d12d71ac2620ee502b24
Mangesh Ghiware [Sun, 22 Sep 2013 20:00:24 +0000 (13:00 -0700)]
Add (back) receiver to disable camera.
Bug:
10411981
Change-Id: Icff31d2da466746ef6b00d4be32e92067cebd1f1
nicolasroard [Sat, 21 Sep 2013 02:01:27 +0000 (19:01 -0700)]
am
635faca5: am
aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
* commit '
635faca5953f313a1fb0fd1cd62e65699e3c565b':
Fix crash / jank / presets add
nicolasroard [Sat, 21 Sep 2013 01:59:05 +0000 (18:59 -0700)]
am
aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
* commit '
aff375e3d13c6e593414399e7374ead96b5e43b9':
Fix crash / jank / presets add
nicolasroard [Sat, 21 Sep 2013 01:57:15 +0000 (01:57 +0000)]
Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
nicolasroard [Sat, 21 Sep 2013 01:49:41 +0000 (18:49 -0700)]
Fix crash / jank / presets add
- don't cache immutable bitmaps
- fix junk in anims/zoom/constrain
- fix edge glow when moving
- fix double-tap zoom
- fix presets / user presets adds
- fix state panel names for geometry ops
bug:
10803026
Change-Id: I9328d7005d3ecee3566c104c3392de9325c50b74
John Hoford [Sat, 21 Sep 2013 00:42:45 +0000 (17:42 -0700)]
John Hoford [Sat, 21 Sep 2013 00:38:34 +0000 (17:38 -0700)]
am
a552bfde: clarify strings
* commit '
a552bfdede68643270e72f6ca65cb0cde16f2c7f':
clarify strings
John Hoford [Sat, 21 Sep 2013 00:28:18 +0000 (17:28 -0700)]
clarify strings
bug:
10602303
bug:
10558554
bug:
10489263
Change-Id: I4cabada74244d535eb023e52a36bca0897fb75fe
John Hoford [Fri, 20 Sep 2013 23:27:39 +0000 (16:27 -0700)]
am
eef0ca49: am
e56abc70: prevent editing of GIF
* commit '
eef0ca494583fe37504d12efe4b8f1c7d6ccb8bd':
prevent editing of GIF
John Hoford [Fri, 20 Sep 2013 23:24:58 +0000 (16:24 -0700)]
am
e56abc70: prevent editing of GIF
* commit '
e56abc7049e35f705161086fe51d0ecdbf451b8b':
prevent editing of GIF
John Hoford [Fri, 20 Sep 2013 22:14:51 +0000 (15:14 -0700)]
prevent editing of GIF
bug:
10642974
Change-Id: Ic61da19f6106c9d42c5b39ae9cc0cf0765f6d1ae
John Hoford [Fri, 20 Sep 2013 21:18:40 +0000 (14:18 -0700)]
am
7599aaad: am
c491ad2b: remove print for video
* commit '
7599aaad4b43fec4fac1a09e5a6e085d86e4bf2a':
remove print for video
John Hoford [Fri, 20 Sep 2013 21:13:47 +0000 (14:13 -0700)]
am
c491ad2b: remove print for video
* commit '
c491ad2b7630eed7cf43ef0c1064bd4fe42e06a1':
remove print for video
John Hoford [Fri, 20 Sep 2013 20:50:37 +0000 (13:50 -0700)]
remove print for video
bug:
10455873
Change-Id: I8f62881b95ad8cd3fff73452eb7d91b05b1ddd8d
John Hoford [Fri, 20 Sep 2013 16:31:30 +0000 (09:31 -0700)]
am
1940b05c: am
36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad
* commit '
1940b05cbba9a7ed0b2bfed50f052fa64c45e70c':
Fix string capitalization
John Hoford [Fri, 20 Sep 2013 16:31:30 +0000 (09:31 -0700)]
am
e4a1c7ca: am
76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
* commit '
e4a1c7caa23d77b56dca5be6325c5dcebf628543':
fix grid drawing bug in ImageStraighten
John Hoford [Fri, 20 Sep 2013 16:27:20 +0000 (09:27 -0700)]
am
36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad
* commit '
36a1262a0138c64b56595b1209bac92d00211f51':
Fix string capitalization
John Hoford [Fri, 20 Sep 2013 16:27:19 +0000 (09:27 -0700)]
am
76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
* commit '
76ef9162b8323a6a48e339895cbd8d428a74a230':
fix grid drawing bug in ImageStraighten
John Hoford [Fri, 20 Sep 2013 16:24:21 +0000 (16:24 +0000)]
Merge "Fix string capitalization" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:24:08 +0000 (16:24 +0000)]
Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:00:06 +0000 (09:00 -0700)]
Fix string capitalization
bug:
10487803
Change-Id: I16c18388ac47851f3fffcca8be13eb77b60ddbfb
John Hoford [Fri, 20 Sep 2013 14:41:52 +0000 (07:41 -0700)]
fix grid drawing bug in ImageStraighten
Change-Id: I4fec941385dd819afc30922823a087cd9962824b
Svetoslav Ganov [Fri, 20 Sep 2013 01:28:14 +0000 (18:28 -0700)]
am
c3ad457f: Update Gallery due to API changes.
* commit '
c3ad457f84686754d8e7a6f78907a9b82391b00f':
Update Gallery due to API changes.
Svetoslav Ganov [Thu, 19 Sep 2013 17:04:54 +0000 (10:04 -0700)]
Update Gallery due to API changes.
bug:
10461180
Change-Id: I1c92871ef97b61920410d12d71ac2620ee502b24
Mangesh Ghiware [Thu, 19 Sep 2013 23:46:15 +0000 (16:46 -0700)]
am
c12bb313: am
6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
* commit '
c12bb31340542493e0083f999fe687acf938f09c':
Use the same taskAffinity for trampoline as Camera
Mangesh Ghiware [Thu, 19 Sep 2013 23:44:13 +0000 (16:44 -0700)]
am
6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
* commit '
6904a72d84d6662c00be83186468600f84448590':
Use the same taskAffinity for trampoline as Camera
Mangesh Ghiware [Thu, 19 Sep 2013 23:42:02 +0000 (23:42 +0000)]
Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
Mangesh Ghiware [Thu, 19 Sep 2013 22:56:15 +0000 (15:56 -0700)]
Use the same taskAffinity for trampoline as Camera
Bug:
10842131
Change-Id: I2bf6961d7c411dc95e9b9589d9ec71ee34b3011f
Baligh Uddin [Thu, 19 Sep 2013 21:38:46 +0000 (14:38 -0700)]
am
8b22f385: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8b22f385a5ac36cdf16494679b8535c9393eb6ec':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 21:34:23 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Hoford [Thu, 19 Sep 2013 19:28:57 +0000 (12:28 -0700)]
am
1c30f5dc: am
962cf04c: change the max print resolution
* commit '
1c30f5dc1334af8b68c0a5ecd15b5c7528f81cc5':
change the max print resolution
John Hoford [Thu, 19 Sep 2013 19:25:41 +0000 (12:25 -0700)]
am
962cf04c: change the max print resolution
* commit '
962cf04c60249c2d116f9ee07e747180bee46014':
change the max print resolution
John Hoford [Thu, 19 Sep 2013 19:04:41 +0000 (12:04 -0700)]
change the max print resolution
Change-Id: Ie2cc1c3f40675ae163438c9b09f26e4ac1881367