OSDN Git Service
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: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 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 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
ztenghui [Wed, 15 May 2013 17:25:40 +0000 (17:25 +0000)]
Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
Marco Nelissen [Wed, 15 May 2013 14:58:32 +0000 (07:58 -0700)]
am
6e59979d: Merge "Enable virtualization" into jb-mr2-dev
* commit '
6e59979de90664d5e93d25a4bf2e165de2e20ac2':
Enable virtualization
Marco Nelissen [Wed, 15 May 2013 14:56:19 +0000 (14:56 +0000)]
Merge "Enable virtualization" into jb-mr2-dev
The Android Automerger [Wed, 15 May 2013 12:55:39 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Michael Kolb [Tue, 14 May 2013 22:43:28 +0000 (15:43 -0700)]
Grey out undo/redo/reset according to state
Bug:
8791729
Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827
Michael Kolb [Tue, 14 May 2013 21:28:14 +0000 (14:28 -0700)]
Correct label position after rotation
Bug:
8963421
Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3
Doris Liu [Tue, 14 May 2013 21:28:05 +0000 (14:28 -0700)]
am
18f19a72: am
26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
* commit '
18f19a722c327edcf8f84fc5494f13cbbe816a4d':
Pause face detection when review captured images
Doris Liu [Tue, 14 May 2013 21:26:46 +0000 (14:26 -0700)]
am
26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
* commit '
26dbb20c15e27d22a14efd0a25ec4e50cf5084cc':
Pause face detection when review captured images
Doris Liu [Tue, 14 May 2013 21:25:22 +0000 (21:25 +0000)]
Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
Tim Murray [Tue, 14 May 2013 19:46:10 +0000 (12:46 -0700)]
am
a24c4906: am
33f2a880: Only link librsjni in unbundled branches.
* commit '
a24c4906455e02f1a8cc8db98dd2280a1d19eca4':
Only link librsjni in unbundled branches.
Tim Murray [Tue, 14 May 2013 19:44:55 +0000 (12:44 -0700)]
am
33f2a880: Only link librsjni in unbundled branches.
* commit '
33f2a8800ff5228bf81a0fdc75c1289bae9a4d1c':
Only link librsjni in unbundled branches.
Doris Liu [Tue, 14 May 2013 18:31:19 +0000 (11:31 -0700)]
Pause face detection when review captured images
Bug:
8799508
Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
The Android Automerger [Tue, 14 May 2013 12:55:38 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Tim Murray [Mon, 13 May 2013 22:47:58 +0000 (15:47 -0700)]
Only link librsjni in unbundled branches.
bug
8939828
Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a
Marco Nelissen [Mon, 13 May 2013 20:36:01 +0000 (13:36 -0700)]
Enable virtualization
When the Intent says to virtualize, and the right virtualizer is
present on the device, enable virtualization.
b/
8767565
Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2
Doris Liu [Mon, 13 May 2013 18:38:16 +0000 (11:38 -0700)]
am
c5fb797d: am
25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce
* commit '
c5fb797d41515e15fba40042bc947543b5e9896c':
New count down beeps.
Doris Liu [Mon, 13 May 2013 18:34:47 +0000 (11:34 -0700)]
am
25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce
* commit '
25d69c11831fabf8f4e474aaf17b05dd001979ce':
New count down beeps.
Doris Liu [Mon, 13 May 2013 18:32:20 +0000 (18:32 +0000)]
Merge "New count down beeps." into gb-ub-photos-bryce
ztenghui [Sat, 11 May 2013 00:44:23 +0000 (17:44 -0700)]
Fix another annoying warning log spam
bug:
8771541
When we set up the icon rendering, we need to set the geometry, too.
Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92
Doris Liu [Mon, 13 May 2013 17:48:54 +0000 (10:48 -0700)]
New count down beeps.
Bug:
8872947
Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a
The Android Automerger [Mon, 13 May 2013 12:55:53 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
George Mount [Fri, 10 May 2013 06:40:45 +0000 (23:40 -0700)]
am
09e1a5ac: am
ac94740c: Remove GL dependency on unused stencil buffers.
* commit '
09e1a5ac2cdd9bccd543df91859152a0aa3c3879':
Remove GL dependency on unused stencil buffers.
George Mount [Fri, 10 May 2013 01:04:58 +0000 (18:04 -0700)]
am
ac94740c: Remove GL dependency on unused stencil buffers.
* commit '
ac94740cd673a016542d803c8600633c99b7427e':
Remove GL dependency on unused stencil buffers.
George Mount [Thu, 9 May 2013 20:30:39 +0000 (13:30 -0700)]
Remove GL dependency on unused stencil buffers.
Bug
8884435
Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34
ztenghui [Thu, 9 May 2013 16:22:08 +0000 (09:22 -0700)]
am
f4733e6f: am
9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce
* commit '
f4733e6f0f8c7012a448f375627478bfb9e53c96':
Fix the verbose log
ztenghui [Thu, 9 May 2013 16:19:40 +0000 (09:19 -0700)]
am
9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce
* commit '
9a4fb2dc95722c45e2acb4f4fe380d27830f8d8b':
Fix the verbose log
ztenghui [Thu, 9 May 2013 16:18:09 +0000 (16:18 +0000)]
Merge "Fix the verbose log" into gb-ub-photos-bryce
The Android Automerger [Thu, 9 May 2013 12:55:35 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Bart Sears [Thu, 9 May 2013 06:14:57 +0000 (23:14 -0700)]
am
de8d7096: am
b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce
* commit '
de8d70965ebea26929aae9f40245e5147d638f65':
Close menu in onPause
Bart Sears [Thu, 9 May 2013 06:13:47 +0000 (23:13 -0700)]
am
b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce
* commit '
b298ab636fec3894b9e702eaa0a6028ba03f49b1':
Close menu in onPause
Bart Sears [Thu, 9 May 2013 06:12:06 +0000 (06:12 +0000)]
Merge "Close menu in onPause" into gb-ub-photos-bryce
Michael Kolb [Thu, 9 May 2013 00:02:15 +0000 (17:02 -0700)]
am
c3ec037f: am
e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
* commit '
c3ec037ffa27fb45e1bbf8ba9d08da22a6979920':
Add drop shadow to preview thumb
Michael Kolb [Thu, 9 May 2013 00:00:00 +0000 (17:00 -0700)]
am
e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
* commit '
e324a388ead1f291fe27eb6b4ce5f25b55a29a49':
Add drop shadow to preview thumb
Michael Kolb [Wed, 8 May 2013 23:58:45 +0000 (23:58 +0000)]
Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
ztenghui [Wed, 8 May 2013 21:43:15 +0000 (14:43 -0700)]
Fix the verbose log
Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging.
bug:
8771541
Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
Michael Kolb [Wed, 8 May 2013 00:24:23 +0000 (17:24 -0700)]
Add drop shadow to preview thumb
Bug:
8826241
Also, remove animateSlide blocker, it caused frozen review
Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
Michael Kolb [Wed, 8 May 2013 23:05:04 +0000 (16:05 -0700)]
Close menu in onPause
Bug:
8722672
Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
Sascha Haeberling [Wed, 8 May 2013 22:17:52 +0000 (15:17 -0700)]
am
b51819ba: am
58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
* commit '
b51819ba4e1690aa43ba112be707220414e44f3b':
Reduce max size of bitmap returned by crop dialog.
Sascha Haeberling [Wed, 8 May 2013 22:15:30 +0000 (15:15 -0700)]
am
58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
* commit '
58f32428768ff67520e0363de7a8c1929a4eac1f':
Reduce max size of bitmap returned by crop dialog.
Sascha Haeberling [Wed, 8 May 2013 22:13:44 +0000 (22:13 +0000)]
Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 21:36:59 +0000 (14:36 -0700)]
am
17b4b977: am
c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce
* commit '
17b4b977fad36b1b943cafef043e02c707844c97':
Fix second level menu
Michael Kolb [Wed, 8 May 2013 21:32:20 +0000 (14:32 -0700)]
am
c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce
* commit '
c3fde4b4032591fc34ce118860e53fe92c0b3706':
Fix second level menu
Michael Kolb [Wed, 8 May 2013 21:30:01 +0000 (21:30 +0000)]
Merge "Fix second level menu" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 18:14:35 +0000 (11:14 -0700)]
Fix second level menu
Bug:
8857098
Added Countdown timer and picture size items
Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
Sascha Haeberling [Wed, 8 May 2013 21:00:42 +0000 (14:00 -0700)]
Reduce max size of bitmap returned by crop dialog.
Bug:
8851336
Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6
Angus Kong [Wed, 8 May 2013 20:39:17 +0000 (13:39 -0700)]
am
50e22843: Merge "Further assets clean up." into jb-mr2-dev
* commit '
50e2284308089c4ad0e7a9fbef1ac0cdb1caddf2':
Further assets clean up.
Angus Kong [Wed, 8 May 2013 20:34:24 +0000 (20:34 +0000)]
Merge "Further assets clean up." into jb-mr2-dev
Angus Kong [Mon, 6 May 2013 20:40:52 +0000 (13:40 -0700)]
Further assets clean up.
Remove unused assets and layouts.
bug:
8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
Angus Kong [Wed, 8 May 2013 18:21:01 +0000 (11:21 -0700)]
am
fafd8bbc: am
188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
* commit '
fafd8bbcc3b33539ccd7ee4e6d69f31aede3b1e7':
DO NOT MERGE Further assets clean up.
Bobby Georgescu [Wed, 8 May 2013 18:20:56 +0000 (11:20 -0700)]
am
b45e0eab: am
9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
* commit '
b45e0eab05a503c53ff8ad9f2213abe64acf5d3e':
Fix memory leak in SparseArrayBitmapPool
Angus Kong [Wed, 8 May 2013 18:17:43 +0000 (11:17 -0700)]
am
188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
* commit '
188ad6eda97b4e05853d582198722e70f9e03705':
DO NOT MERGE Further assets clean up.
Angus Kong [Wed, 8 May 2013 18:09:44 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
Bobby Georgescu [Wed, 8 May 2013 17:50:29 +0000 (10:50 -0700)]
am
9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
* commit '
9fcabfb535f9e094f77cbdba5305d04209adc0b3':
Fix memory leak in SparseArrayBitmapPool
Angus Kong [Mon, 6 May 2013 20:40:52 +0000 (13:40 -0700)]
DO NOT MERGE Further assets clean up.
Remove unused assets and layouts.
bug:
8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
Bobby Georgescu [Wed, 8 May 2013 17:49:16 +0000 (17:49 +0000)]
Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
The Android Automerger [Wed, 8 May 2013 12:55:42 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Bobby Georgescu [Tue, 7 May 2013 23:41:04 +0000 (16:41 -0700)]
Fix memory leak in SparseArrayBitmapPool
Bug:
8857493
Change-Id: Ie5fae457aea91973caa07f8955b1364df573821b
Doris Liu [Wed, 8 May 2013 00:33:27 +0000 (17:33 -0700)]
am
ca83651a: am
b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
* commit '
ca83651a7fd9244682d340e4af2c6f52f5ba80ed':
Fix video capture intent overlapping buttons
Michael Kolb [Wed, 8 May 2013 00:33:24 +0000 (17:33 -0700)]
am
dcd90240: am
0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce
* commit '
dcd90240d4723c2c2305c0a9c0fca2790fccfeeb':
Add animation to slice selection
Michael Kolb [Wed, 8 May 2013 00:33:22 +0000 (17:33 -0700)]
am
7174d685: am
9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce
* commit '
7174d6857e992f3abafdda968a1053725f65a28c':
Remove unused assets
Doris Liu [Wed, 8 May 2013 00:29:12 +0000 (17:29 -0700)]
am
b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
* commit '
b281a6463f22c75c5b4a7a7079bdb55e484c2d07':
Fix video capture intent overlapping buttons
Doris Liu [Wed, 8 May 2013 00:27:28 +0000 (00:27 +0000)]
Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:26:05 +0000 (17:26 -0700)]
am
0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce
* commit '
0a830ce4b5424ff9919b9156eb0635e671a67a81':
Add animation to slice selection
Michael Kolb [Wed, 8 May 2013 00:23:40 +0000 (00:23 +0000)]
Merge "Add animation to slice selection" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:22:56 +0000 (17:22 -0700)]
am
9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce
* commit '
9a26f823b2894d3decf47b28ee10d08932b09adf':
Remove unused assets
Michael Kolb [Wed, 8 May 2013 00:20:44 +0000 (00:20 +0000)]
Merge "Remove unused assets" into gb-ub-photos-bryce
Michael Kolb [Tue, 7 May 2013 22:58:47 +0000 (15:58 -0700)]
Remove unused assets
Bug:
8656481
Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
Sascha Haeberling [Tue, 7 May 2013 22:16:11 +0000 (15:16 -0700)]
am
a8e0de46: am
6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
* commit '
a8e0de46eea85c30f4817f2c2517d061d12ba994':
Avoid rounding errors from cropping uncropped images.
Doris Liu [Tue, 7 May 2013 20:48:10 +0000 (13:48 -0700)]
Fix video capture intent overlapping buttons
Bug:
8839010
Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
Sascha Haeberling [Tue, 7 May 2013 22:10:36 +0000 (15:10 -0700)]
am
6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
* commit '
6febbfc6c9c2d645f22fb200574fe14fa1201046':
Avoid rounding errors from cropping uncropped images.
Sascha Haeberling [Tue, 7 May 2013 22:08:31 +0000 (22:08 +0000)]
Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
Michael Kolb [Tue, 7 May 2013 20:53:19 +0000 (13:53 -0700)]
Add animation to slice selection
Bug:
8826233
Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
Michael Kolb [Tue, 7 May 2013 20:30:50 +0000 (13:30 -0700)]
am
d7ec31f0: am
48ce39b8: Fix review button placement
* commit '
d7ec31f066c8de6ad28cebfe7e6bd7d41bda8532':
Fix review button placement
Michael Kolb [Tue, 7 May 2013 20:28:20 +0000 (13:28 -0700)]
am
48ce39b8: Fix review button placement
* commit '
48ce39b881f60fde8c9a1536199980c31d38188c':
Fix review button placement
Michael Kolb [Mon, 6 May 2013 23:14:09 +0000 (16:14 -0700)]
Fix review button placement
Bug:
8833788
Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
Sascha Haeberling [Tue, 7 May 2013 18:04:08 +0000 (11:04 -0700)]
Avoid rounding errors from cropping uncropped images.
Bug:
8736111
Also don't treat "none" as a non-modifying filter.
Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
Doris Liu [Tue, 7 May 2013 17:11:58 +0000 (10:11 -0700)]
am
dec72c89: am
ed1224f1: Resize children to avoid laying out outside parent
* commit '
dec72c898e34f01ea2ffda1a6614b0bdcb719933':
Resize children to avoid laying out outside parent
Doris Liu [Tue, 7 May 2013 17:07:57 +0000 (10:07 -0700)]
am
ed1224f1: Resize children to avoid laying out outside parent
* commit '
ed1224f1b98a1a534f5a3b18739465ed6114529a':
Resize children to avoid laying out outside parent
The Android Automerger [Tue, 7 May 2013 12:55:38 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Doris Liu [Tue, 7 May 2013 01:30:30 +0000 (18:30 -0700)]
Resize children to avoid laying out outside parent
Bug:
8838983
Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
Elliott Hughes [Mon, 6 May 2013 21:16:44 +0000 (14:16 -0700)]
resolved conflicts for merge of
f959df75 to jb-mr2-dev-plus-aosp
Change-Id: Ic56346cb59b2817482c3c33a2bcd1d552dd432da
George Mount [Mon, 6 May 2013 20:43:38 +0000 (13:43 -0700)]
am
6c14823c: am
08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
* commit '
6c14823c50bbfdb1765a9b5987bee8d83882eece':
Fix black background on save progress indicator.
George Mount [Mon, 6 May 2013 20:41:42 +0000 (13:41 -0700)]
am
08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
* commit '
08d2c51392978383699aedcf63d24e5122b3b7a5':
Fix black background on save progress indicator.
George Mount [Mon, 6 May 2013 20:40:25 +0000 (20:40 +0000)]
Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
OSDN Git Service
