OSDN Git Service
The Android Open Source Project [Wed, 10 Apr 2013 17:14:06 +0000 (10:14 -0700)]
am
23f4673d: (-s ours) am
711d2c79: Reconcile with jb-mr2-release - do not merge
* commit '
23f4673d3de46215cf748a20a8b28adf83003a35':
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:20:48 +0000 (09:20 -0700)]
am
1dd60491: am
53699202: am
8656a57c: am
3bc806a8: Small cleanup in setting resources
* commit '
1dd604913e2e37716be86966d66c4a22a8cb1436':
Small cleanup in setting resources
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:41:19 +0000 (07:41 -0700)]
am
c1633888: am
18063b26: am
990e5979: am
e29b5733: Add a third pipeline reserved for the high res preview
* commit '
c1633888a1ee04bc2feef85e10a2c67ea8add0ef':
Add a third pipeline reserved for the high res preview
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
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:54:01 +0000 (18:54 -0700)]
am
badc4b4b: am
a92202f1: am
81dac121: am
701955ac: Merge "support icon styles" into gb-ub-photos-bryce
* commit '
badc4b4b438d41b5104b324d26371475dfbcb218':
support icon styles
nicolasroard [Wed, 10 Apr 2013 01:54:01 +0000 (18:54 -0700)]
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)]
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:54:41 +0000 (16:54 -0700)]
am
890d6da9: am
ce8a4493: am
3c11e0a2: am
8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
* commit '
890d6da919fd7229efc68fc2b59dacbae5d28605':
Implements swipe in editor menu
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:22:22 +0000 (16:22 -0700)]
am
841d8ff6: am
bebf7a65: am
80e32c08: am
4c644f36: Fix to imports in NewPhotoModule.
* commit '
841d8ff6ecdd0b70f6aa641911ee2962b25b5c45':
Fix to imports in NewPhotoModule.
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:11:35 +0000 (16:11 -0700)]
am
8dae8a3b: am
47ff8168: am
1b34000f: am
dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
* commit '
8dae8a3b8aaf3f069ac29aedbf1d2e02da01ef4d':
Moving crop to a separate activity. Refactoring.
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 22:00:04 +0000 (15:00 -0700)]
am
14458a72: am
2a7fc983: am
1d18d4f2: am
355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
* commit '
14458a7281290151c091dce6dedf0596a0b42af7':
Add more gestures and animations in FilmStripView.
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:31:41 +0000 (14:31 -0700)]
am
a026b065: am
01359f63: am
6b775d62: am
7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce
* commit '
a026b06598adfe440ed30d031f07d8d4bcf5164f':
Refresh parameters during recording.
nicolasroard [Tue, 9 Apr 2013 21:31:40 +0000 (14:31 -0700)]
am
f6ee470d: am
0b209056: am
15d05dc7: am
a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce
* commit '
f6ee470d0fc324e8241682c23cb71214f209d18c':
Hide the category panel when editing
John Hoford [Tue, 9 Apr 2013 21:31:39 +0000 (14:31 -0700)]
am
ba635f61: am
1d44a7ef: am
34d607c8: am
ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce
* commit '
ba635f617a405ac8e20c9e98c53019e03b86d18d':
ui cleanup
Bobby Georgescu [Tue, 9 Apr 2013 21:31:39 +0000 (14:31 -0700)]
am
65d94c03: am
8e9faa89: am
16eafe60: am
f79a935f: Remove unneeded READ_SMS permission
* commit '
65d94c036347ea9aba03674680179e1f09c41d0c':
Remove unneeded READ_SMS permission
Doris Liu [Tue, 9 Apr 2013 21:31:38 +0000 (14:31 -0700)]
am
e1725525: am
9a58b957: am
a5d3f7e3: am
fb063617: Work in progress - Put preview in TextureView
* commit '
e1725525ca3820419fae426e8c0dfe1e76f20527':
Work in progress - Put preview in TextureView
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
Bobby Georgescu [Tue, 9 Apr 2013 20:02:35 +0000 (13:02 -0700)]
am
f79a935f: Remove unneeded READ_SMS permission
* commit '
f79a935f1ce85c55c8fba0b46dee362c653a8a78':
Remove unneeded READ_SMS permission
John Hoford [Tue, 9 Apr 2013 20:02:06 +0000 (20:02 +0000)]
Merge "ui cleanup" into gb-ub-photos-bryce
John Hoford [Tue, 9 Apr 2013 18:51:42 +0000 (11:51 -0700)]
ui cleanup
Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
Bobby Georgescu [Mon, 8 Apr 2013 17:14:14 +0000 (10:14 -0700)]
Remove unneeded READ_SMS permission
Bug:
8469283
Change-Id: I0d211705fe1fb86dc0ce85230e82d500f0202291
Doris Liu [Tue, 9 Apr 2013 17:56:41 +0000 (10:56 -0700)]
am
a5d3f7e3: am
fb063617: Work in progress - Put preview in TextureView
* commit '
a5d3f7e3c7b75a6c8315770e39c5b241a7693ec2':
Work in progress - Put preview in TextureView
Doris Liu [Tue, 9 Apr 2013 17:54:03 +0000 (10:54 -0700)]
am
fb063617: Work in progress - Put preview in TextureView
* commit '
fb0636179335a7786ec2c0edf9889a55596db126':
Work in progress - Put preview in TextureView
Doris Liu [Fri, 15 Mar 2013 04:01:35 +0000 (21:01 -0700)]
Work in progress - Put preview in TextureView
Fixed gesture recognizing and pie menu.
Fixed camera picker. Exposure setting got fixed with rebasing.
Rebased for new pie menu
Fixed camera mode switch listener
Ongoing: secure album, aspect ratio for video recording on ICS
Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
nicolasroard [Tue, 9 Apr 2013 16:57:45 +0000 (09:57 -0700)]
am
e1b1837f: am
001e2989: am
6177241b: am
b1c75f60: Fix panel color background in landscape
* commit '
e1b1837f765cb9dfe6d4d98eb06fa89044d0a69a':
Fix panel color background in landscape
nicolasroard [Tue, 9 Apr 2013 16:54:51 +0000 (09:54 -0700)]
am
001e2989: am
6177241b: am
b1c75f60: Fix panel color background in landscape
* commit '
001e29896a085ebfbc84c1ca56862a1f0e693831':
Fix panel color background in landscape
nicolasroard [Tue, 9 Apr 2013 16:51:28 +0000 (09:51 -0700)]
am
6177241b: am
b1c75f60: Fix panel color background in landscape
* commit '
6177241b8b2fc91c627abbf88dca95a7cd35ff81':
Fix panel color background in landscape
nicolasroard [Tue, 9 Apr 2013 16:49:34 +0000 (09:49 -0700)]
am
b1c75f60: Fix panel color background in landscape
* commit '
b1c75f6028ecbf7bd05f945c542da0f848bc594b':
Fix panel color background in landscape
nicolasroard [Tue, 9 Apr 2013 16:46:17 +0000 (09:46 -0700)]
Fix panel color background in landscape
Change-Id: Id1a0470c8df5fe39f5504a43e1602672ac0d584d
nicolasroard [Tue, 9 Apr 2013 16:10:24 +0000 (09:10 -0700)]
am
12d4b5dd: am
eddc3ca4: am
f35ee031: am
01a4beb1: Fix history original image Change 1st and 2nd panel background color
* commit '
12d4b5dd3536fe3532d1f28dd8d27fcec41b4612':
Fix history original image Change 1st and 2nd panel background color
nicolasroard [Tue, 9 Apr 2013 16:07:05 +0000 (09:07 -0700)]
am
eddc3ca4: am
f35ee031: am
01a4beb1: Fix history original image Change 1st and 2nd panel background color
* commit '
eddc3ca420d53bfc818b6d6732239de8a95a709c':
Fix history original image Change 1st and 2nd panel background color
nicolasroard [Tue, 9 Apr 2013 16:04:55 +0000 (09:04 -0700)]
am
f35ee031: am
01a4beb1: Fix history original image Change 1st and 2nd panel background color
* commit '
f35ee0318655de92bb37c3763c750f8cff77131d':
Fix history original image Change 1st and 2nd panel background color
nicolasroard [Tue, 9 Apr 2013 16:03:12 +0000 (09:03 -0700)]
am
01a4beb1: Fix history original image Change 1st and 2nd panel background color
* commit '
01a4beb197d74dddf788efaf6aedef434dfb8f8f':
Fix history original image Change 1st and 2nd panel background color
nicolasroard [Tue, 9 Apr 2013 15:57:59 +0000 (08:57 -0700)]
Fix history original image
Change 1st and 2nd panel background color
Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
nicolasroard [Tue, 9 Apr 2013 15:51:24 +0000 (08:51 -0700)]
am
e83856fe: am
f928d8ee: am
5aff32af: am
948a4e6e: Fix history panel first appearance
* commit '
e83856fe6f891d1257e9282b5c965853eb630593':
Fix history panel first appearance
nicolasroard [Tue, 9 Apr 2013 15:47:42 +0000 (08:47 -0700)]
am
f928d8ee: am
5aff32af: am
948a4e6e: Fix history panel first appearance
* commit '
f928d8ee846e06893c14acee8127c85e971df462':
Fix history panel first appearance
nicolasroard [Tue, 9 Apr 2013 15:45:26 +0000 (08:45 -0700)]
am
5aff32af: am
948a4e6e: Fix history panel first appearance
* commit '
5aff32afed49528cb104cdcf912bedf6f3440d9b':
Fix history panel first appearance
nicolasroard [Tue, 9 Apr 2013 15:42:02 +0000 (08:42 -0700)]
am
948a4e6e: Fix history panel first appearance
* commit '
948a4e6e38d8d9ec9926877524478d6692437105':
Fix history panel first appearance
nicolasroard [Tue, 9 Apr 2013 15:18:18 +0000 (08:18 -0700)]
Fix history panel first appearance
Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22
The Android Automerger [Tue, 9 Apr 2013 12:56:04 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Tue, 9 Apr 2013 04:21:07 +0000 (21:21 -0700)]
am
b1a84f1e: am
3b39df6d: am
8fafeaff: am
d98f781d: Fix positioning of cancel/done buttons
* commit '
b1a84f1ed70965198b1c0d1ed957d866b449670f':
Fix positioning of cancel/done buttons
nicolasroard [Tue, 9 Apr 2013 04:17:06 +0000 (21:17 -0700)]
am
3b39df6d: am
8fafeaff: am
d98f781d: Fix positioning of cancel/done buttons
* commit '
3b39df6d0fbb4f6e3435c7e2efc6095c6d709052':
Fix positioning of cancel/done buttons
nicolasroard [Tue, 9 Apr 2013 04:14:03 +0000 (21:14 -0700)]
am
8fafeaff: am
d98f781d: Fix positioning of cancel/done buttons
* commit '
8fafeaff4820fe88cd9f854c79fac90b8040f5c2':
Fix positioning of cancel/done buttons
nicolasroard [Tue, 9 Apr 2013 04:10:13 +0000 (21:10 -0700)]
am
d98f781d: Fix positioning of cancel/done buttons
* commit '
d98f781dd0899477ff5be42279a06da81fd6e526':
Fix positioning of cancel/done buttons
nicolasroard [Tue, 9 Apr 2013 03:54:45 +0000 (20:54 -0700)]
Fix positioning of cancel/done buttons
Change-Id: Ie229a20d882841444ece28a3ab63cbc6ea916699
nicolasroard [Tue, 9 Apr 2013 03:24:57 +0000 (20:24 -0700)]
am
c52ab9b0: am
171b216c: am
923140cf: am
1fe7caee: Fix crash in curves
* commit '
c52ab9b0364cb7f540d8424536b586f6c9de7713':
Fix crash in curves
nicolasroard [Tue, 9 Apr 2013 03:22:37 +0000 (20:22 -0700)]
am
171b216c: am
923140cf: am
1fe7caee: Fix crash in curves
* commit '
171b216c4a3920a869aa748f9d1254a041e07f1b':
Fix crash in curves
nicolasroard [Tue, 9 Apr 2013 03:20:28 +0000 (20:20 -0700)]
am
923140cf: am
1fe7caee: Fix crash in curves
* commit '
923140cf2301ed611568cb9da3a88a725d2328f0':
Fix crash in curves
nicolasroard [Tue, 9 Apr 2013 03:17:02 +0000 (20:17 -0700)]
am
1fe7caee: Fix crash in curves
* commit '
1fe7caeeaab314cd70d0b54f8f3dd3225c71c081':
Fix crash in curves