OSDN Git Service
Ed Heyl [Wed, 20 Feb 2013 21:47:32 +0000 (13:47 -0800)]
Merge remote-tracking branch 'goog/jb-mr2-release'
Victor Doba [Wed, 20 Feb 2013 17:31:38 +0000 (09:31 -0800)]
am
c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
* commit '
c8e006639baf1512715e0d7f2c02f88204ab55c0':
Show the Utility Panel by default.
Victor Doba [Wed, 20 Feb 2013 17:29:53 +0000 (17:29 +0000)]
Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
John Hoford [Wed, 20 Feb 2013 16:45:14 +0000 (08:45 -0800)]
am
1863a311: fix vignette startup issues
* commit '
1863a3119a802517b1c2a53763f904f73fdc940b':
fix vignette startup issues
John Hoford [Wed, 20 Feb 2013 16:31:40 +0000 (08:31 -0800)]
fix vignette startup issues
Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
The Android Automerger [Wed, 20 Feb 2013 13:56:07 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to master
John Hoford [Tue, 19 Feb 2013 23:35:59 +0000 (15:35 -0800)]
am
a93d5ee9: add movable vignette
* commit '
a93d5ee9c409e2328dcbe2326591436f8ac23146':
add movable vignette
John Hoford [Sat, 16 Feb 2013 17:20:59 +0000 (09:20 -0800)]
add movable vignette
Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
Baligh Uddin [Tue, 19 Feb 2013 19:23:32 +0000 (11:23 -0800)]
am
03010e45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
03010e45387b8f1a715fd7f5cfac0793008fdc9b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:23:18 +0000 (19:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 19 Feb 2013 19:22:16 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 19 Feb 2013 19:21:08 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 19 Feb 2013 19:14:23 +0000 (11:14 -0800)]
am
fc18a75c: (-s ours) Import translations. DO NOT MERGE
* commit '
fc18a75c530669285ea09714a69ef6c0094c889b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:09:12 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9dbc652fcb3ab0bc43774e57de6f2aa00454a742
Auto-generated-cl: translation import
Baligh Uddin [Tue, 19 Feb 2013 19:08:44 +0000 (11:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: If262abcd9e8910ccaf49d20f3a853dcf97cd9b63
Auto-generated-cl: translation import
Baligh Uddin [Tue, 19 Feb 2013 19:07:32 +0000 (11:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idc5fea5d79c5cfdbccf8fb4ba3eaa427a148e042
Auto-generated-cl: translation import
Baligh Uddin [Tue, 19 Feb 2013 19:06:45 +0000 (11:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic697e873594208549955d01399accad284b239db
Auto-generated-cl: translation import
The Android Automerger [Tue, 19 Feb 2013 17:51:51 +0000 (09:51 -0800)]
merge in jb-mr2-release history after reset to master
Michael Kolb [Tue, 19 Feb 2013 17:51:48 +0000 (09:51 -0800)]
am
a96e8879: Fix auto-focus areas
* commit '
a96e8879473c9f9c937a5f14dbbd35579b4d0952':
Fix auto-focus areas
Michael Kolb [Sat, 16 Feb 2013 21:13:47 +0000 (13:13 -0800)]
Fix auto-focus areas
Use a specific focus area in continuous AF
Use a smaller AF area for tap to focus
Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
Michael Kolb [Mon, 18 Feb 2013 23:38:56 +0000 (15:38 -0800)]
am
1bf8b9a5: Fix AF animation
* commit '
1bf8b9a5b418891836435f4ec502846640368690':
Fix AF animation
Michael Kolb [Mon, 18 Feb 2013 23:16:44 +0000 (15:16 -0800)]
Fix AF animation
Bug:
8219462
Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
Doris Liu [Sat, 16 Feb 2013 01:41:23 +0000 (17:41 -0800)]
am
d9de7afa: Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
* commit '
d9de7afa6c343e85b9c2c0221ca280c69a349c5f':
Make photo orientation consistent with UI
Doris Liu [Sat, 16 Feb 2013 01:39:59 +0000 (01:39 +0000)]
Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
Doris Liu [Fri, 15 Feb 2013 18:55:37 +0000 (10:55 -0800)]
Make photo orientation consistent with UI
Also fixed the wrong animation orientation.
Bug:
7302506
Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
Angus Kong [Sat, 16 Feb 2013 00:15:52 +0000 (16:15 -0800)]
am
c86e1ca3: Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce
* commit '
c86e1ca339d770b9199cc332a27edcd0f0c42900':
Bump up the version number to 1.1.40002
Angus Kong [Sat, 16 Feb 2013 00:14:01 +0000 (00:14 +0000)]
Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce
John Reck [Sat, 16 Feb 2013 00:12:45 +0000 (16:12 -0800)]
am
7db6eb02: Remove more com.android.camera.R
* commit '
7db6eb02312a4c649d34351d1d78add1d8ec814b':
Remove more com.android.camera.R
John Reck [Sat, 16 Feb 2013 00:08:26 +0000 (16:08 -0800)]
Remove more com.android.camera.R
Change-Id: I410baaf4a3f0d824d44ea24435a1716cad3bb966
Angus Kong [Sat, 16 Feb 2013 00:09:11 +0000 (16:09 -0800)]
Bump up the version number to 1.1.40002
Change-Id: I5911eb3345b7774a6690372999fce3673b551f84
John Reck [Sat, 16 Feb 2013 00:02:34 +0000 (16:02 -0800)]
am
ace62b69: Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
* commit '
ace62b69bd53518faea7be986f6c7481b271ca3f':
Remove com.android.camera.R
John Reck [Sat, 16 Feb 2013 00:01:05 +0000 (00:01 +0000)]
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
John Reck [Fri, 15 Feb 2013 23:51:30 +0000 (15:51 -0800)]
Remove com.android.camera.R
Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
Baligh Uddin [Fri, 15 Feb 2013 22:28:50 +0000 (14:28 -0800)]
am
d87305a5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
d87305a547d614d47af48886d7e1c616ad20336e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Feb 2013 22:28:50 +0000 (14:28 -0800)]
am
3b6283e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
3b6283e9c6756d7416eb985670f1eb4c4eb21ec9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Feb 2013 22:20:43 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 15 Feb 2013 22:19:55 +0000 (22:19 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 15 Feb 2013 22:18:22 +0000 (22:18 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 15 Feb 2013 22:15:38 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 15 Feb 2013 21:07:30 +0000 (13:07 -0800)]
am
4a94787f: Merge "Don\'t use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce
* commit '
4a94787ffc692090ec83b3f3c402c5d65afde4d9':
Don't use AsyncTasks to fetch images via MTP
Bobby Georgescu [Fri, 15 Feb 2013 21:05:21 +0000 (21:05 +0000)]
Merge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce
Baligh Uddin [Fri, 15 Feb 2013 20:13:45 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I32d848588279560363c19375e230c06396049f98
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Feb 2013 20:13:18 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7ae5988c73d412dd05a2f8b947cb8c97d5d1bba9
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Feb 2013 20:12:37 +0000 (12:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3d38844df4fd1ec40eec417dcf330ea2bcae5fa8
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Feb 2013 20:11:51 +0000 (12:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ieb36191410097c0161e4e847dab30b6b029b5de0
Auto-generated-cl: translation import
Michael Kolb [Fri, 15 Feb 2013 15:45:11 +0000 (07:45 -0800)]
am
a54931e0: Merge "New capture animation" into gb-ub-photos-bryce
* commit '
a54931e070a9134cf0a8d16cc628997844fc93dc':
New capture animation
Michael Kolb [Fri, 15 Feb 2013 15:43:12 +0000 (15:43 +0000)]
Merge "New capture animation" into gb-ub-photos-bryce
Victor Doba [Fri, 15 Feb 2013 12:24:41 +0000 (13:24 +0100)]
Show the Utility Panel by default.
Jason Noguchi [Fri, 15 Feb 2013 03:03:53 +0000 (19:03 -0800)]
am
c1560663: Merge "Merging camera test with gallery test." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Jason Noguchi (1)
* commit '
c15606633d024e0351517470b800590261403e8e':
Merging camera test with gallery test.
Jason Noguchi [Fri, 15 Feb 2013 03:01:56 +0000 (03:01 +0000)]
Merge "Merging camera test with gallery test." into gb-ub-photos-bryce
Bobby Georgescu [Thu, 14 Feb 2013 03:23:54 +0000 (19:23 -0800)]
Don't use AsyncTasks to fetch images via MTP
Bug:
8192491
Avoids allocations when scrolling through the importer
grid by not using AsyncTasks anymore (which meant one
object creation per change of the source image). Also
fix an NPE if a device is unplugged during scrolling.
Change-Id: I4e7022ca5d4573402e60b16fbd82ea65bc6627e0
Ruben Brunk [Fri, 15 Feb 2013 01:31:24 +0000 (17:31 -0800)]
am
aa4c3460: Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Ruben Brunk (1)
* commit '
aa4c34606a697172987e5ac379e82ce41b7cbaa5':
Fixed crop display for setting contacts/wallpapers.
Ruben Brunk [Fri, 15 Feb 2013 01:29:31 +0000 (01:29 +0000)]
Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce
Ruben Brunk [Fri, 15 Feb 2013 00:18:22 +0000 (16:18 -0800)]
Fixed crop display for setting contacts/wallpapers.
Bug:
8187056
Bug:
8196779
Bug:
8140241
Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c
Jason Noguchi [Wed, 13 Feb 2013 23:35:23 +0000 (15:35 -0800)]
Merging camera test with gallery test.
Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
John Hoford [Thu, 14 Feb 2013 23:41:46 +0000 (15:41 -0800)]
am
886202f1: Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Hoford (1)
* commit '
886202f1f45ee49ee6571d0592aa1395607302aa':
refactor to support many filter based on RedEye
John Hoford [Thu, 14 Feb 2013 23:40:25 +0000 (23:40 +0000)]
Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce
John Hoford [Thu, 14 Feb 2013 23:08:28 +0000 (15:08 -0800)]
refactor to support many filter based on RedEye
Change-Id: I92ff19d8f750f5bf4c188129580e22990874501e
Michael Kolb [Thu, 14 Feb 2013 21:40:39 +0000 (13:40 -0800)]
New capture animation
Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4
Michael Kolb [Thu, 14 Feb 2013 21:44:09 +0000 (13:44 -0800)]
am
0ada802b: Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Michael Kolb (1)
* commit '
0ada802ba4753b08dea010aad0a35c3237034f7a':
Fix inexplicable monkey NPE
Michael Kolb [Thu, 14 Feb 2013 21:43:00 +0000 (21:43 +0000)]
Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
Michael Kolb [Thu, 14 Feb 2013 16:30:59 +0000 (08:30 -0800)]
Fix inexplicable monkey NPE
Bug:
8049510
Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
The Android Automerger [Thu, 14 Feb 2013 13:56:13 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to master
Doris Liu [Thu, 14 Feb 2013 02:42:56 +0000 (18:42 -0800)]
am
e0d4962f: Fix video disappearing when rotated
# Via Doris Liu
* commit '
e0d4962f96a01b0ff403f8149b9e92ae81f58b77':
Fix video disappearing when rotated
Doris Liu [Thu, 14 Feb 2013 02:28:03 +0000 (18:28 -0800)]
Fix video disappearing when rotated
Bug:
7459723
Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37
Angus Kong [Thu, 14 Feb 2013 02:25:45 +0000 (18:25 -0800)]
am
a9ec959c: Make ShutterButton visible after initialization.
# Via Angus Kong
* commit '
a9ec959c6e43c00db0e74856f76efba976300f80':
Make ShutterButton visible after initialization.
Angus Kong [Thu, 14 Feb 2013 02:13:13 +0000 (18:13 -0800)]
Make ShutterButton visible after initialization.
bug:
8186870
Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
John Hoford [Thu, 14 Feb 2013 02:07:27 +0000 (18:07 -0800)]
am
4e6c07b7: get redeye working again
# Via John Hoford
* commit '
4e6c07b71b269ee3fe7f6fa455bc540238df9ded':
get redeye working again
John Hoford [Wed, 13 Feb 2013 23:52:31 +0000 (15:52 -0800)]
get redeye working again
nicolasroard [Thu, 14 Feb 2013 01:30:09 +0000 (17:30 -0800)]
am
31ebfb40: Merge "Fix sync representations" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
31ebfb400aa73c51980ef78e4c26fcc1a39fdd4d':
Fix sync representations
nicolasroard [Thu, 14 Feb 2013 01:28:53 +0000 (01:28 +0000)]
Merge "Fix sync representations" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 23:51:25 +0000 (15:51 -0800)]
Fix sync representations
Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
Ruben Brunk [Wed, 13 Feb 2013 23:25:13 +0000 (15:25 -0800)]
am
92decf25: Merge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Ruben Brunk (1)
* commit '
92decf254d7feb277d68fb94a4e4f90ba2c2dbeb':
Fix proguard and makefile targets for tests.
Ruben Brunk [Wed, 13 Feb 2013 23:24:17 +0000 (23:24 +0000)]
Merge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce
John Hoford [Wed, 13 Feb 2013 22:32:38 +0000 (14:32 -0800)]
am
ecdda817: fix draw to support rotation/crop
# Via John Hoford
* commit '
ecdda817f112286ac6bab2ac4bf508e7dd8609ac':
fix draw to support rotation/crop
Ruben Brunk [Wed, 13 Feb 2013 21:36:21 +0000 (13:36 -0800)]
Fix proguard and makefile targets for tests.
Change-Id: I19f35567eff7c6d377a95b434dc4735faca93861
John Hoford [Wed, 13 Feb 2013 19:40:52 +0000 (11:40 -0800)]
fix draw to support rotation/crop
Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
Bobby Georgescu [Wed, 13 Feb 2013 19:47:55 +0000 (11:47 -0800)]
am
add77dfc: Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Bobby Georgescu (1)
* commit '
add77dfcee665d309e5eb20e344e1d10e7c4070e':
Importer: Full-screen viewing, UI refinement, refactoring
Bobby Georgescu [Wed, 13 Feb 2013 19:46:39 +0000 (19:46 +0000)]
Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 19:32:44 +0000 (11:32 -0800)]
am
cd627a70: Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
cd627a7010f6907204f7bcb5d13111ba02ee30fe':
Pass the ImagePreset to ImageFilter
nicolasroard [Wed, 13 Feb 2013 19:31:16 +0000 (19:31 +0000)]
Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 19:23:56 +0000 (11:23 -0800)]
Pass the ImagePreset to ImageFilter
Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
Baligh Uddin [Wed, 13 Feb 2013 19:21:23 +0000 (11:21 -0800)]
am
e956f5d5: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '
e956f5d5e84c8ea3b75bba218bc173f03c6a1739':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 13 Feb 2013 17:56:27 +0000 (09:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I83bb60752d8f060ab32413ee3a670228db5a8055
Auto-generated-cl: translation import
Baligh Uddin [Wed, 13 Feb 2013 17:56:05 +0000 (09:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I73eaf3450a743ae918e3391efcceb4acd355b85d
Auto-generated-cl: translation import
The Android Automerger [Wed, 13 Feb 2013 13:56:21 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to master
nicolasroard [Wed, 13 Feb 2013 03:41:08 +0000 (19:41 -0800)]
am
f7cfa85f: Fix curves slowness
# Via nicolasroard
* commit '
f7cfa85f7dc2bb29affefff9374f3a4029b8a057':
Fix curves slowness
nicolasroard [Wed, 13 Feb 2013 03:40:08 +0000 (19:40 -0800)]
Fix curves slowness
Change-Id: If25f3ce1c3da02daa90405987075b87ce676c84e
Bobby Georgescu [Fri, 1 Feb 2013 20:57:14 +0000 (12:57 -0800)]
Importer: Full-screen viewing, UI refinement, refactoring
Bug:
7990333
Bug:
8151814
Bug:
8037411
This CL adds or changes the following things:
- Full-screen image viewing and UI for switching modes
- Moved general functionality from MtpThumbnailTileView
to MtpImageView to allow for reuse in full-screen image
use-case
- MtpBitmapCache moved from ui to data package
- Orientation now respected when set in image metadata
- Miscellaneous UI consistency issues fixed
- Miscellaneous instability issues fixed
Change-Id: I5f188b763617b693e32fedc03273d711d604922a
nicolasroard [Wed, 13 Feb 2013 01:14:29 +0000 (17:14 -0800)]
am
c8aa8ac1: Clean up red eye correction
# Via nicolasroard
* commit '
c8aa8ac19118f1c1be1bda63d4d72589aed49da4':
Clean up red eye correction
nicolasroard [Wed, 13 Feb 2013 00:32:43 +0000 (16:32 -0800)]
Clean up red eye correction
Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
John Hoford [Wed, 13 Feb 2013 01:07:19 +0000 (17:07 -0800)]
am
4b1e6fbd: fix ranges for various filters
# Via John Hoford
* commit '
4b1e6fbdf437b7a25fb3eb18a2ed43c9ab4eccc8':
fix ranges for various filters
John Hoford [Wed, 13 Feb 2013 00:59:13 +0000 (16:59 -0800)]
fix ranges for various filters
Change-Id: I6790b06c5c4094c442ce19cb2ed7ddb6a4152f3a
Angus Kong [Wed, 13 Feb 2013 00:59:09 +0000 (16:59 -0800)]
am
a241341d: Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Angus Kong (1)
* commit '
a241341de88c982bc619d25f0455561075d177e8':
Wait for the previous MosaicPreviewRenderer to end
Angus Kong [Wed, 13 Feb 2013 00:58:18 +0000 (00:58 +0000)]
Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 00:12:51 +0000 (16:12 -0800)]
am
4d25bee7: Merge "Turn back on the state panel" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
4d25bee70415aabd3fa8439a75d02e14323e187d':
Turn back on the state panel
John Hoford [Wed, 13 Feb 2013 00:09:44 +0000 (16:09 -0800)]
am
ac75eb40: Merge "fix the draw clear bug" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Hoford (1)
* commit '
ac75eb409e097ab01622427eabcbb2a3fd2f2c9c':
fix the draw clear bug
nicolasroard [Wed, 13 Feb 2013 00:09:31 +0000 (00:09 +0000)]
Merge "Turn back on the state panel" into gb-ub-photos-bryce
John Hoford [Wed, 13 Feb 2013 00:07:43 +0000 (00:07 +0000)]
Merge "fix the draw clear bug" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 00:06:15 +0000 (16:06 -0800)]
Turn back on the state panel
Change-Id: I22706078d4026ce4e24917c484a30a56de431983