OSDN Git Service
Ruben Brunk [Thu, 11 Apr 2013 03:48:02 +0000 (20:48 -0700)]
am
468542ec: am
8c18867c: am
41185c4f: Fix downsampling check in crop.
* commit '
468542ec0dc136c6703076bf2cc72fe3140f0eef':
Fix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 03:44:20 +0000 (20:44 -0700)]
am
8c18867c: am
41185c4f: Fix downsampling check in crop.
* commit '
8c18867c4dce46eb80ba02732a3cbe0c420e6a64':
Fix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 03:40:41 +0000 (20:40 -0700)]
am
41185c4f: Fix downsampling check in crop.
* commit '
41185c4fdbccad17b79697306a7f8044b8f7ffd3':
Fix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 00:27:33 +0000 (17:27 -0700)]
Fix downsampling check in crop.
Bug:
8586301
Change-Id: I4c5441f779122adb984368609cfea39a60190848
Baligh Uddin [Wed, 10 Apr 2013 20:06:58 +0000 (13:06 -0700)]
am
2a9ce784: am
5bb44c4b: am
27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
2a9ce78469937c974f243ad45ef4548c8017b25d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:06:58 +0000 (13:06 -0700)]
am
55f7eb96: am
a084c8d3: am
ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
55f7eb9680a6f2fe3003e4cec5b9ea88bb02b1bf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:06:57 +0000 (13:06 -0700)]
am
e67741ab: am
3869b8db: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
e67741ab6b9ca35cab1a527efecfcaaf7b5593cf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:06:56 +0000 (13:06 -0700)]
am
f6800b4d: am
35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
f6800b4dfde049578d8230c73a10d1d74a050a99':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:04:03 +0000 (13:04 -0700)]
am
5bb44c4b: am
27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
5bb44c4bef4190364ef0fa34ef643c926e42803a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:04:02 +0000 (13:04 -0700)]
am
a084c8d3: am
ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
a084c8d3e7787544394d8622f61984b074a06b89':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:04:01 +0000 (13:04 -0700)]
am
3869b8db: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
3869b8db1b66c1a470c03d4b97455e3608c4f990':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 20:04:00 +0000 (13:04 -0700)]
am
35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
35e29cb6f248176682fd88b6a7bf8c99487551ff':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:59:22 +0000 (12:59 -0700)]
am
27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
27b9459f3764d45d46092aa541e691ff861e0aff':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:59:21 +0000 (12:59 -0700)]
am
ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
ba81a885844c3a04e58f70f6eed90de01b5ea44e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:58:35 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 10 Apr 2013 19:58:23 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 10 Apr 2013 19:58:12 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 10 Apr 2013 19:57:48 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 10 Apr 2013 19:57:38 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 10 Apr 2013 19:57:27 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 10 Apr 2013 19:51:33 +0000 (12:51 -0700)]
am
f9c5cd31: am
f5e37e42: am
6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
* commit '
f9c5cd315f6b5fe87655c59397de604285c64b39':
Correctly scale images in MTP importer
Bobby Georgescu [Wed, 10 Apr 2013 19:47:39 +0000 (12:47 -0700)]
am
f5e37e42: am
6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
* commit '
f5e37e421790f01024f846d4bc45c6da0c00fb3f':
Correctly scale images in MTP importer
Bobby Georgescu [Wed, 10 Apr 2013 19:42:13 +0000 (12:42 -0700)]
am
6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
* commit '
6b138c2240d35571e1f49258f84ec2659223d251':
Correctly scale images in MTP importer
Bobby Georgescu [Wed, 10 Apr 2013 19:39:42 +0000 (19:39 +0000)]
Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
Ruben Brunk [Wed, 10 Apr 2013 18:59:33 +0000 (11:59 -0700)]
am
97c6f7c9: am
3bc8cc41: am
b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
* commit '
97c6f7c92e78cc61e53de60f353ff4b48b2fe454':
Adding simple crop ui. Refactoring.
Ruben Brunk [Wed, 10 Apr 2013 18:56:43 +0000 (11:56 -0700)]
am
3bc8cc41: am
b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
* commit '
3bc8cc417e7b874b7b3f401cc33f073756762ebf':
Adding simple crop ui. Refactoring.
Baligh Uddin [Wed, 10 Apr 2013 18:55:01 +0000 (11:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I887a07d700cdfc672db20cc1775e9d65b4ca0bda
Auto-generated-cl: translation import
Baligh Uddin [Wed, 10 Apr 2013 18:54:42 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6e2a262f7c5c46a89c3298d86969347338be77ce
Auto-generated-cl: translation import
Baligh Uddin [Wed, 10 Apr 2013 18:54:22 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0bf928fbe2856bb3519c3586fb91422ee87da533
Auto-generated-cl: translation import
Baligh Uddin [Wed, 10 Apr 2013 18:53:28 +0000 (11:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3bc2cd867e0271fe202d8561d9f667a110a82c5f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 10 Apr 2013 18:52:53 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9789a0f1295136ca95b2d7b19d7fa6f0dc13e192
Auto-generated-cl: translation import
Ruben Brunk [Wed, 10 Apr 2013 18:52:51 +0000 (11:52 -0700)]
am
b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
* commit '
b6b2d1c45f889ca0388b11bb49ae0ce1a1694e90':
Adding simple crop ui. Refactoring.
Baligh Uddin [Wed, 10 Apr 2013 18:52:19 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d953d7ca29bd4ffd4ba96270845448fb6c3d194
Auto-generated-cl: translation import
Bobby Georgescu [Wed, 10 Apr 2013 18:46:56 +0000 (11:46 -0700)]
Correctly scale images in MTP importer
Bug:
8293048
Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
Ruben Brunk [Wed, 10 Apr 2013 18:47:38 +0000 (18:47 +0000)]
Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
ztenghui [Wed, 10 Apr 2013 18:41:22 +0000 (11:41 -0700)]
am
260c37c7: am
a1a67123: am
3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
* commit '
260c37c7e3eb3168981d446c066f549cf69d0d18':
Use MediaMuxer for the video trim and mute.
ztenghui [Wed, 10 Apr 2013 18:35:43 +0000 (11:35 -0700)]
am
a1a67123: am
3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
* commit '
a1a67123245321d970058d668ca50bb218bddb19':
Use MediaMuxer for the video trim and mute.
ztenghui [Wed, 10 Apr 2013 18:31:34 +0000 (11:31 -0700)]
am
3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
* commit '
3eb2fb4dd2ede7f65ee307061213f0e8860f15f6':
Use MediaMuxer for the video trim and mute.
ztenghui [Wed, 10 Apr 2013 18:19:57 +0000 (18:19 +0000)]
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
ztenghui [Mon, 8 Apr 2013 21:37:53 +0000 (14:37 -0700)]
Use MediaMuxer for the video trim and mute.
bug:
8548085
Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
Angus Kong [Wed, 10 Apr 2013 18:01:24 +0000 (11:01 -0700)]
am
8d12b88d: am
0c22972b: am
2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
* commit '
8d12b88d7c1df5798e247039ec9e1d9b0895047f':
Refactor CameraDataAdapter for other data types.
Angus Kong [Wed, 10 Apr 2013 17:41:55 +0000 (10:41 -0700)]
am
0c22972b: am
2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
* commit '
0c22972b061dd2f458eb1185702c2b4ac8d13d1a':
Refactor CameraDataAdapter for other data types.
Angus Kong [Wed, 10 Apr 2013 17:39:18 +0000 (10:39 -0700)]
am
2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
* commit '
2fc6641b80a7aedf54062cbd01c40cbf0764a6ca':
Refactor CameraDataAdapter for other data types.
Angus Kong [Wed, 10 Apr 2013 17:35:58 +0000 (17:35 +0000)]
Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
The Android Open Source Project [Wed, 10 Apr 2013 17:08:28 +0000 (10:08 -0700)]
am
711d2c79: Reconcile with jb-mr2-release - do not merge
* commit '
711d2c797505288085016d0e4e6f3236e02f1263':
The Android Open Source Project [Wed, 10 Apr 2013 17:05:54 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1ffbbe79376c9e0f93dea90e11dfb86b07715328
nicolasroard [Wed, 10 Apr 2013 16:16:38 +0000 (09:16 -0700)]
am
53699202: am
8656a57c: am
3bc806a8: Small cleanup in setting resources
* commit '
53699202c00e7e6090d324b655c30ea2b8b58f74':
Small cleanup in setting resources
nicolasroard [Wed, 10 Apr 2013 16:12:12 +0000 (09:12 -0700)]
am
8656a57c: am
3bc806a8: Small cleanup in setting resources
* commit '
8656a57c6cbbae23cc4fa5ede0b3e816864dc12f':
Small cleanup in setting resources
nicolasroard [Wed, 10 Apr 2013 16:10:00 +0000 (09:10 -0700)]
am
3bc806a8: Small cleanup in setting resources
* commit '
3bc806a8575072c9459fe3698675d3713300d1d3':
Small cleanup in setting resources
nicolasroard [Wed, 10 Apr 2013 15:20:26 +0000 (08:20 -0700)]
Small cleanup in setting resources
Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
nicolasroard [Wed, 10 Apr 2013 14:38:04 +0000 (07:38 -0700)]
am
18063b26: am
990e5979: am
e29b5733: Add a third pipeline reserved for the high res preview
* commit '
18063b265a1a3a8cbe876bbd90e309a575b22be6':
Add a third pipeline reserved for the high res preview
nicolasroard [Wed, 10 Apr 2013 14:33:36 +0000 (07:33 -0700)]
am
990e5979: am
e29b5733: Add a third pipeline reserved for the high res preview
* commit '
990e59793b569db2552cced4aae55194814a3001':
Add a third pipeline reserved for the high res preview
nicolasroard [Wed, 10 Apr 2013 14:31:19 +0000 (07:31 -0700)]
am
e29b5733: Add a third pipeline reserved for the high res preview
* commit '
e29b57330be471dd74672a7bdc74a93dcae3a98b':
Add a third pipeline reserved for the high res preview
The Android Automerger [Wed, 10 Apr 2013 12:56:44 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ruben Brunk [Wed, 10 Apr 2013 07:11:46 +0000 (00:11 -0700)]
Adding simple crop ui. Refactoring.
Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540
nicolasroard [Wed, 10 Apr 2013 01:43:31 +0000 (18:43 -0700)]
Add a third pipeline reserved for the high res preview
Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
John Hoford [Wed, 10 Apr 2013 01:41:34 +0000 (18:41 -0700)]
am
a92202f1: am
81dac121: am
701955ac: Merge "support icon styles" into gb-ub-photos-bryce
* commit '
a92202f1d7992fe3848afbdce2dd814aa9e59acc':
support icon styles
nicolasroard [Wed, 10 Apr 2013 01:41:33 +0000 (18:41 -0700)]
Angus Kong [Mon, 8 Apr 2013 23:57:57 +0000 (16:57 -0700)]
Refactor CameraDataAdapter for other data types.
Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
John Hoford [Wed, 10 Apr 2013 01:35:26 +0000 (18:35 -0700)]
am
81dac121: am
701955ac: Merge "support icon styles" into gb-ub-photos-bryce
* commit '
81dac121ec44462ef68dc1b41de75c3f630997db':
support icon styles
nicolasroard [Wed, 10 Apr 2013 01:35:26 +0000 (18:35 -0700)]
am
e8cf8a59: am
7668544e: Detach old editor
* commit '
e8cf8a5931d8933963c64f2d09b2118d8f80f7be':
Detach old editor
John Hoford [Wed, 10 Apr 2013 01:21:56 +0000 (18:21 -0700)]
am
701955ac: Merge "support icon styles" into gb-ub-photos-bryce
* commit '
701955ac93bb05bff2a826c79ea60f921b3745fc':
support icon styles
nicolasroard [Wed, 10 Apr 2013 01:21:55 +0000 (18:21 -0700)]
am
7668544e: Detach old editor
* commit '
7668544ee3e8ba3b14d127b9ecd1cf4a3b2f3e11':
Detach old editor
John Hoford [Wed, 10 Apr 2013 00:56:32 +0000 (00:56 +0000)]
Merge "support icon styles" into gb-ub-photos-bryce
nicolasroard [Wed, 10 Apr 2013 00:52:08 +0000 (17:52 -0700)]
Detach old editor
Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
John Hoford [Wed, 10 Apr 2013 00:47:24 +0000 (17:47 -0700)]
support icon styles
Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
nicolasroard [Tue, 9 Apr 2013 23:51:34 +0000 (16:51 -0700)]
am
ce8a4493: am
3c11e0a2: am
8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
* commit '
ce8a449351140ef0fe5a86f13c47faa741cb5859':
Implements swipe in editor menu
nicolasroard [Tue, 9 Apr 2013 23:47:10 +0000 (16:47 -0700)]
am
3c11e0a2: am
8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
* commit '
3c11e0a234925657a4c9b59bdda10342e4412c55':
Implements swipe in editor menu
nicolasroard [Tue, 9 Apr 2013 23:43:39 +0000 (16:43 -0700)]
am
8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
* commit '
8eb8dd6ba1957d7e8e75e6fab9f5654ad55d2fe4':
Implements swipe in editor menu
nicolasroard [Tue, 9 Apr 2013 23:40:34 +0000 (23:40 +0000)]
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
Ruben Brunk [Tue, 9 Apr 2013 23:18:43 +0000 (16:18 -0700)]
am
bebf7a65: am
80e32c08: am
4c644f36: Fix to imports in NewPhotoModule.
* commit '
bebf7a65a049df339ad63018803f64a7650bbefb':
Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:15:11 +0000 (16:15 -0700)]
am
80e32c08: am
4c644f36: Fix to imports in NewPhotoModule.
* commit '
80e32c082f971c88627692b3faa4656390439f66':
Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:12:30 +0000 (16:12 -0700)]
am
4c644f36: Fix to imports in NewPhotoModule.
* commit '
4c644f3687d88ea13ff82c3f79b36585ea2c387b':
Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:07:46 +0000 (16:07 -0700)]
am
47ff8168: am
1b34000f: am
dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
* commit '
47ff8168aba192176aef4574cfe2d7bf2a338620':
Moving crop to a separate activity. Refactoring.
Ruben Brunk [Tue, 9 Apr 2013 23:07:35 +0000 (16:07 -0700)]
Fix to imports in NewPhotoModule.
Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef
Ruben Brunk [Tue, 9 Apr 2013 23:04:13 +0000 (16:04 -0700)]
am
1b34000f: am
dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
* commit '
1b34000f478e616a9681623385255418ed562ae6':
Moving crop to a separate activity. Refactoring.
Ruben Brunk [Tue, 9 Apr 2013 23:01:18 +0000 (16:01 -0700)]
am
dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
* commit '
dcd1dd986bc8455ce822e8d9e7a46ea103228351':
Moving crop to a separate activity. Refactoring.
Ruben Brunk [Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)]
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
Ruben Brunk [Fri, 5 Apr 2013 00:20:42 +0000 (17:20 -0700)]
Moving crop to a separate activity. Refactoring.
Bug:
8526929
Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
nicolasroard [Tue, 9 Apr 2013 22:29:35 +0000 (15:29 -0700)]
Implements swipe in editor menu
Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
Angus Kong [Tue, 9 Apr 2013 21:56:22 +0000 (14:56 -0700)]
am
2a7fc983: am
1d18d4f2: am
355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
* commit '
2a7fc983723164cad37189f9801321c02d6d959f':
Add more gestures and animations in FilmStripView.
Angus Kong [Tue, 9 Apr 2013 21:53:46 +0000 (14:53 -0700)]
am
1d18d4f2: am
355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
* commit '
1d18d4f2552df090c3da69aba29faba00f813d6c':
Add more gestures and animations in FilmStripView.
Angus Kong [Tue, 9 Apr 2013 21:51:58 +0000 (14:51 -0700)]
am
355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
* commit '
355eaea088a348c394909fea6c9f812ff25e87ac':
Add more gestures and animations in FilmStripView.
Angus Kong [Tue, 9 Apr 2013 21:49:55 +0000 (21:49 +0000)]
Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
Angus Kong [Tue, 9 Apr 2013 21:26:04 +0000 (14:26 -0700)]
am
01359f63: am
6b775d62: am
7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce
* commit '
01359f63499f2821fc579e484d594d134ce9f6e8':
Refresh parameters during recording.
nicolasroard [Tue, 9 Apr 2013 21:25:59 +0000 (14:25 -0700)]
am
0b209056: am
15d05dc7: am
a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce
* commit '
0b20905636ee79518d61da314ef95cd3d1c2dd63':
Hide the category panel when editing
John Hoford [Tue, 9 Apr 2013 21:25:51 +0000 (14:25 -0700)]
am
1d44a7ef: am
34d607c8: am
ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce
* commit '
1d44a7efa6f6a683bbf5511413b2ea5cd12ddae4':
ui cleanup
Bobby Georgescu [Tue, 9 Apr 2013 21:25:50 +0000 (14:25 -0700)]
am
8e9faa89: am
16eafe60: am
f79a935f: Remove unneeded READ_SMS permission
* commit '
8e9faa89c8bf9e4875b9015293f5a5d534602475':
Remove unneeded READ_SMS permission
Doris Liu [Tue, 9 Apr 2013 21:25:14 +0000 (14:25 -0700)]
am
9a58b957: am
a5d3f7e3: am
fb063617: Work in progress - Put preview in TextureView
* commit '
9a58b957489b76800145b77c8c59290ef6a12cc2':
Work in progress - Put preview in TextureView
Angus Kong [Tue, 9 Apr 2013 21:16:39 +0000 (14:16 -0700)]
am
6b775d62: am
7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce
* commit '
6b775d626cffc2b863da881e800238816caae818':
Refresh parameters during recording.
Angus Kong [Tue, 9 Apr 2013 21:12:48 +0000 (14:12 -0700)]
am
7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce
* commit '
7811d8def7fe1b9d6111566b55a18f6b137f487a':
Refresh parameters during recording.
Angus Kong [Tue, 9 Apr 2013 21:09:38 +0000 (21:09 +0000)]
Merge "Refresh parameters during recording." into gb-ub-photos-bryce
Angus Kong [Wed, 3 Apr 2013 23:56:18 +0000 (16:56 -0700)]
Refresh parameters during recording.
bug:
8504803
Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
nicolasroard [Tue, 9 Apr 2013 20:38:59 +0000 (13:38 -0700)]
am
15d05dc7: am
a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce
* commit '
15d05dc79cdea1a43284883679093c8c5ac943a7':
Hide the category panel when editing
nicolasroard [Tue, 9 Apr 2013 20:35:18 +0000 (13:35 -0700)]
am
a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce
* commit '
a4ff177637432e9f1e5eeb29b9c5dc6bb2949b2a':
Hide the category panel when editing
nicolasroard [Tue, 9 Apr 2013 20:33:04 +0000 (20:33 +0000)]
Merge "Hide the category panel when editing" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 18:46:53 +0000 (11:46 -0700)]
Hide the category panel when editing
Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96
John Hoford [Tue, 9 Apr 2013 20:08:44 +0000 (13:08 -0700)]
am
34d607c8: am
ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce
* commit '
34d607c88f26252325058eaa76dfead319bb6eb6':
ui cleanup
John Hoford [Tue, 9 Apr 2013 20:05:48 +0000 (13:05 -0700)]
am
ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce
* commit '
ddcb0880c9748ce9a77f1472864977c767f46f0f':
ui cleanup
Bobby Georgescu [Tue, 9 Apr 2013 20:05:23 +0000 (13:05 -0700)]
am
16eafe60: am
f79a935f: Remove unneeded READ_SMS permission
* commit '
16eafe6016a70ae9d6e31461321ec5c7b5933aa6':
Remove unneeded READ_SMS permission