OSDN Git Service
Flavio Lerda [Thu, 18 Apr 2013 22:51:08 +0000 (15:51 -0700)]
am
28bfde95: am
51757f32: am
9581384f: am
47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce
* commit '
28bfde95bb61bda5c8218c3342b74afa1780f510':
Usage statistics for sharing.
Baligh Uddin [Thu, 18 Apr 2013 14:39:31 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into master-security-dev
Flavio Lerda [Thu, 18 Apr 2013 13:27:13 +0000 (06:27 -0700)]
am
51757f32: am
9581384f: am
47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce
* commit '
51757f326b320dc6770aea64880caf8e1c8d9574':
Usage statistics for sharing.
Flavio Lerda [Thu, 18 Apr 2013 13:24:05 +0000 (06:24 -0700)]
am
9581384f: am
47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce
* commit '
9581384f4bb5d167883ef14aadf8ef8462dc8815':
Usage statistics for sharing.
Flavio Lerda [Thu, 18 Apr 2013 13:22:14 +0000 (06:22 -0700)]
am
47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce
* commit '
47f28614605a19726d2ab81b90333ba718223b72':
Usage statistics for sharing.
Flavio Lerda [Thu, 18 Apr 2013 13:19:39 +0000 (13:19 +0000)]
Merge "Usage statistics for sharing." into gb-ub-photos-bryce
Ruben Brunk [Thu, 18 Apr 2013 03:04:01 +0000 (20:04 -0700)]
am
7adbd947: am
04440b3c: am
5ed8e518: am
61f3f111: Remove call to superclass onTouch in curves.
* commit '
7adbd947f7a904717353bb73c73b133cac976a2f':
Remove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 02:59:22 +0000 (19:59 -0700)]
am
04440b3c: am
5ed8e518: am
61f3f111: Remove call to superclass onTouch in curves.
* commit '
04440b3c55e11d798510484e7b7eccb04f0b8a1e':
Remove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 02:54:15 +0000 (19:54 -0700)]
am
5ed8e518: am
61f3f111: Remove call to superclass onTouch in curves.
* commit '
5ed8e518b4208e3d748aa421778a885a95f17756':
Remove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 02:51:45 +0000 (19:51 -0700)]
am
61f3f111: Remove call to superclass onTouch in curves.
* commit '
61f3f1113a5b4f8583fd9fcae4d24734617cae21':
Remove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 01:55:53 +0000 (18:55 -0700)]
Remove call to superclass onTouch in curves.
Bug:
8523301
Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f
Ruben Brunk [Thu, 18 Apr 2013 02:01:29 +0000 (19:01 -0700)]
am
fd7a7bfa: am
b343fc4a: am
550a4871: am
869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce
* commit '
fd7a7bfaaf59f949d1007da8b556fb0eb93864ef':
Remove redeye filter.
Sascha Haeberling [Thu, 18 Apr 2013 02:01:29 +0000 (19:01 -0700)]
am
6f85c1bf: am
9aefbe13: am
5aa6cb20: am
49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
* commit '
6f85c1bf75b8b8de73289539834ed8524f1f5cd7':
Add method for returning SoundPool audio type.
Ruben Brunk [Thu, 18 Apr 2013 01:59:04 +0000 (18:59 -0700)]
am
b343fc4a: am
550a4871: am
869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce
* commit '
b343fc4ab76d38830e86cfd5b923dbfcc50339a9':
Remove redeye filter.
Sascha Haeberling [Thu, 18 Apr 2013 01:59:04 +0000 (18:59 -0700)]
am
9aefbe13: am
5aa6cb20: am
49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
* commit '
9aefbe13d8dfb74ca011ca5fca9823b2dcd7ac73':
Add method for returning SoundPool audio type.
Ruben Brunk [Thu, 18 Apr 2013 01:56:12 +0000 (18:56 -0700)]
am
550a4871: am
869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce
* commit '
550a4871904503748660f0d4fc524e83a5756707':
Remove redeye filter.
Sascha Haeberling [Thu, 18 Apr 2013 01:56:11 +0000 (18:56 -0700)]
am
5aa6cb20: am
49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
* commit '
5aa6cb20f0971c633982711666f5be7a61cc37d6':
Add method for returning SoundPool audio type.
Ruben Brunk [Thu, 18 Apr 2013 01:52:20 +0000 (18:52 -0700)]
am
869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce
* commit '
869cb0484c1c9e77d089abe198817709d3e89eb9':
Remove redeye filter.
Sascha Haeberling [Thu, 18 Apr 2013 01:52:19 +0000 (18:52 -0700)]
am
49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
* commit '
49ee213fbb0f3434002693889bdae3e7c0d5b378':
Add method for returning SoundPool audio type.
Ruben Brunk [Thu, 18 Apr 2013 01:49:53 +0000 (01:49 +0000)]
Merge "Remove redeye filter." into gb-ub-photos-bryce
Sascha Haeberling [Thu, 18 Apr 2013 01:48:34 +0000 (01:48 +0000)]
Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
Ruben Brunk [Thu, 18 Apr 2013 01:39:27 +0000 (18:39 -0700)]
Remove redeye filter.
Bug:
8609003
Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
John Hoford [Thu, 18 Apr 2013 00:53:33 +0000 (17:53 -0700)]
am
a7a57818: am
0ee15ec9: am
dd42cac8: am
12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
* commit '
a7a578188e11ef772ce3f4d6910c630f8d6f8d8d':
improve pinch to zoom behavior
John Hoford [Thu, 18 Apr 2013 00:48:56 +0000 (17:48 -0700)]
am
0ee15ec9: am
dd42cac8: am
12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
* commit '
0ee15ec9f463f8b6c8e8294e4e4fc5d99bb707dd':
improve pinch to zoom behavior
Michael Kolb [Thu, 18 Apr 2013 00:45:55 +0000 (17:45 -0700)]
am
18fcbe23: am
4bcc3286: am
133f92d4: am
1c7d2bc2: First part of asset drop
* commit '
18fcbe2321a6e8ac1e5135334b8a5c45f919ff91':
First part of asset drop
John Hoford [Thu, 18 Apr 2013 00:45:01 +0000 (17:45 -0700)]
am
dd42cac8: am
12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
* commit '
dd42cac8336dd6651968fe87e63bac4d84a81b21':
improve pinch to zoom behavior
ztenghui [Thu, 18 Apr 2013 00:44:44 +0000 (17:44 -0700)]
am
69c56c13: am
6e6a0c2d: am
f4f9e425: am
75408cd3: Add accessibility to video player controller.
* commit '
69c56c13f625f4e5f9aee4e4e2e9e6f7532c9d4f':
Add accessibility to video player controller.
nicolasroard [Thu, 18 Apr 2013 00:42:48 +0000 (17:42 -0700)]
am
04ca4b6f: am
071544b6: am
19191a4f: am
83bd8d34: Remove History panel
* commit '
04ca4b6f063f48fe161ea2be4f78b73113855919':
Remove History panel
Ruben Brunk [Thu, 18 Apr 2013 00:42:39 +0000 (17:42 -0700)]
am
fe724d6d: am
c10b3066: am
965a99b8: am
113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
* commit '
fe724d6d1e0523ca44fe2b18868403e5afe59627':
Shows final set of filters in UI.
Doris Liu [Thu, 18 Apr 2013 00:42:21 +0000 (17:42 -0700)]
am
8fab3452: am
c44633a0: am
6aa5d2df: am
953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce
* commit '
8fab34527a24e115f73e30df2fb16646ab58bb94':
Fix face unlock failure
nicolasroard [Thu, 18 Apr 2013 00:42:20 +0000 (17:42 -0700)]
am
8f4dd1ca: am
92a587f9: am
ccc18a73: am
03332473: Make convertBitmap() protected so that Frames can use it.
* commit '
8f4dd1ca45f61f6a31ecce9a0ea0c9e0a685cbeb':
Make convertBitmap() protected so that Frames can use it.
nicolasroard [Thu, 18 Apr 2013 00:42:15 +0000 (17:42 -0700)]
am
8ae1a45f: am
c6a1e41f: am
d80c69a8: am
f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
* commit '
8ae1a45fbc69512f3778283262ae8fdc50bea4fe':
Remove the Simple Edit menu item in Gallery
Angus Kong [Thu, 18 Apr 2013 00:42:00 +0000 (17:42 -0700)]
am
f9e0c3f7: am
fcabacf4: am
65f3514a: am
bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.
* commit '
f9e0c3f70360216f19000a6a701d55d1dd127b30':
Don't wait for Mosaic Renderer ready in UI thread.
nicolasroard [Thu, 18 Apr 2013 00:41:22 +0000 (17:41 -0700)]
John Hoford [Thu, 18 Apr 2013 00:39:47 +0000 (17:39 -0700)]
am
12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
* commit '
12cd022273f14a64d9cdf79aa6a27feb099b9107':
improve pinch to zoom behavior
Michael Kolb [Thu, 18 Apr 2013 00:39:31 +0000 (17:39 -0700)]
am
843408f3: am
53bd5f2c: am
44d3d602: am
0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
* commit '
843408f31d52092a9680e98212aec3e3219277a3':
Angle menu at edge of screen
John Hoford [Thu, 18 Apr 2013 00:36:52 +0000 (00:36 +0000)]
Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
Michael Kolb [Thu, 18 Apr 2013 00:17:53 +0000 (17:17 -0700)]
am
4bcc3286: am
133f92d4: am
1c7d2bc2: First part of asset drop
* commit '
4bcc3286df4879744ce073e71691674b4d413697':
First part of asset drop
Michael Kolb [Thu, 18 Apr 2013 00:14:05 +0000 (17:14 -0700)]
am
133f92d4: am
1c7d2bc2: First part of asset drop
* commit '
133f92d47e420aa9c6455122fa67daa22a3910e8':
First part of asset drop
Michael Kolb [Thu, 18 Apr 2013 00:08:37 +0000 (17:08 -0700)]
am
1c7d2bc2: First part of asset drop
* commit '
1c7d2bc293a1ff824db768756d0309dfbc7f08d8':
First part of asset drop
Michael Kolb [Wed, 17 Apr 2013 23:01:32 +0000 (16:01 -0700)]
First part of asset drop
Bug:
8640131
Added new assets, updated front/back menu entry.
Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
John Hoford [Wed, 17 Apr 2013 20:35:03 +0000 (13:35 -0700)]
improve pinch to zoom behavior
bug:
8630925
Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae
Sascha Haeberling [Wed, 17 Apr 2013 21:55:44 +0000 (14:55 -0700)]
Add method for returning SoundPool audio type.
Bug:
7402245
Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa
Baligh Uddin [Wed, 17 Apr 2013 18:41:28 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic734d26e128768b3be402b99c478354a8bfeb263
Auto-generated-cl: translation import
Angus Kong [Wed, 17 Apr 2013 18:31:56 +0000 (11:31 -0700)]
am
8a67fc80: am
595c2ae1: am
03152021: am
f7771f98: Use extra copy of parameters for concurrent access
* commit '
8a67fc80a0ba65b1cc8903f3b17bcf07218ddf67':
Use extra copy of parameters for concurrent access
ztenghui [Wed, 17 Apr 2013 18:30:51 +0000 (11:30 -0700)]
am
6e6a0c2d: am
f4f9e425: am
75408cd3: Add accessibility to video player controller.
* commit '
6e6a0c2d3bb78b399fe265e3432a952e3ee9c030':
Add accessibility to video player controller.
Michael Kolb [Wed, 17 Apr 2013 18:29:15 +0000 (11:29 -0700)]
am
0b998afb: am
81d1589e: am
baf6d4de: am
78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce
* commit '
0b998afb4c0845f7d9de560d259b0b8fbd619422':
Also, add labels to video menu
Baligh Uddin [Wed, 17 Apr 2013 18:29:01 +0000 (11:29 -0700)]
am
7d702984: (-s ours) am
4c58da80: am
9219a1f4: am
a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
7d702984857c03fb66a7b19cee5201761ad013fc':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:28:57 +0000 (11:28 -0700)]
am
2a737529: (-s ours) am
627d601c: am
09c275b2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
2a73752985688ae54463709d85a3ff3eaaf75504':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:28:50 +0000 (11:28 -0700)]
am
de7f6eaa: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
de7f6eaacdd94d77ee12646e1cb99629624cc109':
Import translations. DO NOT MERGE
Michael Kolb [Wed, 17 Apr 2013 18:28:44 +0000 (11:28 -0700)]
am
04a4d5fb: am
38ee8965: am
272566d7: am
ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce
* commit '
04a4d5fb460bc5004a6223d8c6b6233b3d03fe47':
Add menu labels
Bobby Georgescu [Wed, 17 Apr 2013 18:28:37 +0000 (11:28 -0700)]
am
e0e06eb9: am
ec909ce6: am
814c5c52: am
3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
* commit '
e0e06eb95ce959a676b4c6de172c2a48945fee86':
Fix performance and other issues related to multi-selection
John Hoford [Wed, 17 Apr 2013 18:28:10 +0000 (11:28 -0700)]
am
9ae5d77d: am
63ae852c: am
1c8e45bf: am
d2f5fe60: support for simplified parameters in filter
* commit '
9ae5d77d363d6b1a175cc2c2934256fe95fc0cd8':
support for simplified parameters in filter
The Android Open Source Project [Wed, 17 Apr 2013 18:27:42 +0000 (11:27 -0700)]
am
0b0a4466: (-s ours) am
1e606658: Reconcile with jb-mr2-release - do not merge
* commit '
0b0a44662d384fe0b59028e280b5ec71cdc1fa2d':
am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
ztenghui [Wed, 17 Apr 2013 18:26:06 +0000 (11:26 -0700)]
am
f4f9e425: am
75408cd3: Add accessibility to video player controller.
* commit '
f4f9e425d631c863503f509180015e1d7eca820b':
Add accessibility to video player controller.
nicolasroard [Wed, 17 Apr 2013 18:25:13 +0000 (11:25 -0700)]
am
c512f6b1: am
a827ce9d: am
cba8574c: am
4b6ea5bc: Add direct rendering for border
* commit '
c512f6b1e1d0563d659c0f2bb1ad1758f0f471b8':
Add direct rendering for border
ztenghui [Wed, 17 Apr 2013 18:24:36 +0000 (11:24 -0700)]
am
75408cd3: Add accessibility to video player controller.
* commit '
75408cd38e7efe0755addcf3170932c8b3190bc1':
Add accessibility to video player controller.
Baligh Uddin [Wed, 17 Apr 2013 18:23:57 +0000 (11:23 -0700)]
am
6cf36e8e: (-s ours) am
c47dc315: am
ced505a6: am
b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
6cf36e8ed77182711e1a123fe3ef3621bfa4284f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:23:49 +0000 (11:23 -0700)]
am
2451423d: (-s ours) am
859a2ae9: am
6b4c389d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
2451423dd619890799c9722aa90ef47796c3619d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:23:46 +0000 (11:23 -0700)]
am
d5dafb3b: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
d5dafb3b04640b54ea594be1f75f9fdee1dc8e27':
Import translations. DO NOT MERGE
Bart Sears [Wed, 17 Apr 2013 18:22:50 +0000 (11:22 -0700)]
am
2d8247e7: am
fe0eeedd: am
cadaa899: am
4772792d: Bump up the version number to 1.1.40010
* commit '
2d8247e7aab5a216dfc2a6bb3f78432dad302f78':
Bump up the version number to 1.1.40010
nicolasroard [Wed, 17 Apr 2013 18:22:19 +0000 (11:22 -0700)]
am
3af66978: am
951d74d2: am
439b028e: am
93ef658b: Add a direct rendering mode
* commit '
3af6697817c775e0385b6a5248fccb88e78ddf3e':
Add a direct rendering mode
Michael Kolb [Wed, 17 Apr 2013 18:20:53 +0000 (11:20 -0700)]
am
4f579b88: am
c2e1a167: am
fb4605d7: am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
4f579b88864e7f842a00f22207e4a81b7e6e34e0':
Add checks for NPE in video pie menu.
Michael Kolb [Wed, 17 Apr 2013 18:20:52 +0000 (11:20 -0700)]
am
2efb7da9: am
95cb5157: am
76193ba8: am
af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
* commit '
2efb7da949698896d9245702c3b27f170e616f7f':
Fix NPE in PieRenderer
Doris Liu [Wed, 17 Apr 2013 18:20:52 +0000 (11:20 -0700)]
am
0097e253: am
a6e42ecb: am
2bcea6d6: am
d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
* commit '
0097e2534d11f21020f8616bf488c222b44db05e':
Fix ICS recording aspect ratio
ztenghui [Tue, 16 Apr 2013 20:52:07 +0000 (13:52 -0700)]
Add accessibility to video player controller.
bug:
5714277
cherry pick the Carlsbad CL:
https://googleplex-android-review.git.corp.google.com/#/c/297944/
Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
Flavio Lerda [Tue, 16 Apr 2013 08:46:07 +0000 (09:46 +0100)]
Usage statistics for sharing.
Bug:
8433834
Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
nicolasroard [Wed, 17 Apr 2013 00:55:35 +0000 (17:55 -0700)]
am
071544b6: am
19191a4f: am
83bd8d34: Remove History panel
* commit '
071544b6003966b4154e78ce5a91ca1267031406':
Remove History panel
nicolasroard [Wed, 17 Apr 2013 00:51:24 +0000 (17:51 -0700)]
am
19191a4f: am
83bd8d34: Remove History panel
* commit '
19191a4f58f4d80529b3400d1bd653faeacfbc2a':
Remove History panel
nicolasroard [Wed, 17 Apr 2013 00:46:10 +0000 (17:46 -0700)]
am
83bd8d34: Remove History panel
* commit '
83bd8d346d295e4fe06212da957feb77ee23c04d':
Remove History panel
nicolasroard [Wed, 17 Apr 2013 00:09:20 +0000 (17:09 -0700)]
Remove History panel
Now that we have the state, history
is not that useful. For clarity's sake
we are removing it.
bug:
8620913
bug:
8503386
bug:
8324322
bug:
8324023
Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b
Ruben Brunk [Wed, 17 Apr 2013 00:06:45 +0000 (17:06 -0700)]
am
c10b3066: am
965a99b8: am
113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
* commit '
c10b3066e063e14cc9bf9cbecf6f8098f955340b':
Shows final set of filters in UI.
Ruben Brunk [Wed, 17 Apr 2013 00:04:41 +0000 (17:04 -0700)]
am
965a99b8: am
113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
* commit '
965a99b87b38bc1a846c7dfb4349d399f9e1bc1e':
Shows final set of filters in UI.
Ruben Brunk [Wed, 17 Apr 2013 00:02:38 +0000 (17:02 -0700)]
am
113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
* commit '
113e0fbd251966629719f390e43b320b84751304':
Shows final set of filters in UI.
Ruben Brunk [Tue, 16 Apr 2013 23:59:56 +0000 (23:59 +0000)]
Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
Ruben Brunk [Tue, 16 Apr 2013 23:25:31 +0000 (16:25 -0700)]
Shows final set of filters in UI.
Bug:
8609003
Change-Id: Id7530da3e11fb88a964b881ba8f8fad70b40bc23
Doris Liu [Tue, 16 Apr 2013 23:20:18 +0000 (16:20 -0700)]
am
c44633a0: am
6aa5d2df: am
953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce
* commit '
c44633a0e53ad406bc2629196b69bec325581b66':
Fix face unlock failure
nicolasroard [Tue, 16 Apr 2013 23:20:17 +0000 (16:20 -0700)]
am
92a587f9: am
ccc18a73: am
03332473: Make convertBitmap() protected so that Frames can use it.
* commit '
92a587f98ab0e7f40ce1c6ba5b164057dad7363c':
Make convertBitmap() protected so that Frames can use it.
Doris Liu [Tue, 16 Apr 2013 23:16:26 +0000 (16:16 -0700)]
am
6aa5d2df: am
953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce
* commit '
6aa5d2dfbf4890a027512d114759864fc4207025':
Fix face unlock failure
nicolasroard [Tue, 16 Apr 2013 23:16:25 +0000 (16:16 -0700)]
am
ccc18a73: am
03332473: Make convertBitmap() protected so that Frames can use it.
* commit '
ccc18a734f2f3de9230a09b0d31a9ce27baef000':
Make convertBitmap() protected so that Frames can use it.
Doris Liu [Tue, 16 Apr 2013 23:14:25 +0000 (16:14 -0700)]
am
953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce
* commit '
953f109b688477b086281fe09074d3886ef87fba':
Fix face unlock failure
nicolasroard [Tue, 16 Apr 2013 23:14:24 +0000 (16:14 -0700)]
am
03332473: Make convertBitmap() protected so that Frames can use it.
* commit '
0333247337b910bb981c6ba17ca0cc76d5b614ff':
Make convertBitmap() protected so that Frames can use it.
Doris Liu [Tue, 16 Apr 2013 23:12:49 +0000 (23:12 +0000)]
Merge "Fix face unlock failure" into gb-ub-photos-bryce
nicolasroard [Tue, 16 Apr 2013 22:56:35 +0000 (15:56 -0700)]
Make convertBitmap() protected so that Frames can use it.
bug:
8633011
Change-Id: Ic731a1d906a6a388a22568f396111f8ca3b4475e
Doris Liu [Tue, 16 Apr 2013 22:54:42 +0000 (15:54 -0700)]
Fix face unlock failure
Bug:
7494156
Change-Id: I6c909e498305ff3e66efdeeb9fb5581ea8f51715
nicolasroard [Tue, 16 Apr 2013 22:50:14 +0000 (15:50 -0700)]
am
c6a1e41f: am
d80c69a8: am
f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
* commit '
c6a1e41fb7272a5227a4c73652c1226df8afd928':
Remove the Simple Edit menu item in Gallery
nicolasroard [Tue, 16 Apr 2013 22:46:26 +0000 (15:46 -0700)]
am
d80c69a8: am
f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
* commit '
d80c69a8398e79296e99f026e4d6e184c07dce39':
Remove the Simple Edit menu item in Gallery
nicolasroard [Tue, 16 Apr 2013 22:44:05 +0000 (15:44 -0700)]
am
f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
* commit '
f3f0aae490911245ad6a5602b77b72f0546b93cc':
Remove the Simple Edit menu item in Gallery
nicolasroard [Tue, 16 Apr 2013 22:42:34 +0000 (22:42 +0000)]
Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
nicolasroard [Tue, 16 Apr 2013 20:46:34 +0000 (13:46 -0700)]
Remove the Simple Edit menu item in Gallery
bug:
8609003
Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
Angus Kong [Tue, 16 Apr 2013 21:58:55 +0000 (14:58 -0700)]
am
fcabacf4: am
65f3514a: am
bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.
* commit '
fcabacf449cbca3bd219d5eb4031d6ac5a779caf':
Don't wait for Mosaic Renderer ready in UI thread.
Angus Kong [Tue, 16 Apr 2013 21:55:27 +0000 (14:55 -0700)]
am
65f3514a: am
bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.
* commit '
65f3514aa0d91ac86927a1b5c5026c2ad3763700':
Don't wait for Mosaic Renderer ready in UI thread.
Angus Kong [Tue, 16 Apr 2013 21:49:49 +0000 (14:49 -0700)]
am
bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.
* commit '
bc02d7dcb2e9716a1f1e297fef435c8b0275aafe':
Don't wait for Mosaic Renderer ready in UI thread.
Angus Kong [Tue, 16 Apr 2013 20:57:06 +0000 (13:57 -0700)]
Don't wait for Mosaic Renderer ready in UI thread.
bug:
8292711
Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d
nicolasroard [Tue, 16 Apr 2013 20:31:03 +0000 (13:31 -0700)]
nicolasroard [Tue, 16 Apr 2013 20:27:11 +0000 (13:27 -0700)]
nicolasroard [Tue, 16 Apr 2013 20:23:19 +0000 (13:23 -0700)]
am
fb6a8e16: New state panel
* commit '
fb6a8e166f0a46d2a994a408b1679e3a67fdcb52':
New state panel
nicolasroard [Mon, 15 Apr 2013 21:41:00 +0000 (14:41 -0700)]
New state panel
bug:
8620913
bug:
8503386
Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
Michael Kolb [Tue, 16 Apr 2013 04:55:03 +0000 (21:55 -0700)]
am
53bd5f2c: am
44d3d602: am
0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
* commit '
53bd5f2c166cf70a3380acd3aa3dd2d21a0d515d':
Angle menu at edge of screen
Michael Kolb [Tue, 16 Apr 2013 00:33:17 +0000 (17:33 -0700)]
am
44d3d602: am
0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
* commit '
44d3d6023273403a5957c7f807744602cdb84d47':
Angle menu at edge of screen
OSDN Git Service
