Adam Powell
|
412545f7f0
|
am f2d7c67f: am de565f3b: am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
* commit 'f2d7c67f946deb6ba3ba224f1e4d2f3454058da2':
Keyguard - MultiPaneChallengeLayout measurement/layout changes
|
2012-11-08 15:32:24 -08:00 |
|
Victoria Lease
|
e006945d34
|
am b69c08a8: am b000c362: am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit 'b69c08a832a9b5d45273bcf694d7177f23b734f7':
|
2012-11-08 15:32:20 -08:00 |
|
Chris Wren
|
e2b6a93596
|
am f5dc0a19: am 888322a6: am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev
* commit 'f5dc0a19acd17d827b932e78373530508ea70fe4':
animating challenge closed should close the challenge.
|
2012-11-08 15:32:17 -08:00 |
|
Winson Chung
|
b10df88b02
|
am 267214f4: am 43ecd191: am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions.
* commit '267214f4e63f0cf01918a4f491d40b79dcb6ab57':
Using screen dimensions to calculate the expanded PagedView dimensions.
|
2012-11-08 15:32:13 -08:00 |
|
Jim Miller
|
bef827572c
|
am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
* commit 'c7dc250d5a3dab93ff87e9986a71ae58ff124399':
Add isSafeModeEnabled() API to WindowManagerService
|
2012-11-08 15:32:09 -08:00 |
|
Danielle Millett
|
6b646e8205
|
am ae54cd6e: am 2f4be247: am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev
* commit 'ae54cd6e3d34bebb344156e36ba2a78c0a3cdf72':
Removing callbacks in onDetachedFromWindow, fixes b/7465673
|
2012-11-08 15:32:05 -08:00 |
|
Adam Cohen
|
4d6d5f185c
|
am e5785461: am 441d3401: am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
* commit 'e5785461b753f68258c9609754f158f3dbf5fb26':
Making sure the sticky widget logic works with music
|
2012-11-08 15:32:01 -08:00 |
|
Adam Cohen
|
1b19b519e6
|
am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
* commit 'd50f206a08663c05dbe6c14918c6eef61df0bc97':
Attempted fix for issue 7469415
|
2012-11-08 15:31:57 -08:00 |
|
Amith Yamasani
|
fda301cf75
|
am 9862ac9c: am 22559dc5: am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit '9862ac9c6979f6bc65a7c8ccfb9166588dac1ee7':
|
2012-11-08 15:31:50 -08:00 |
|
Chris Wren
|
abbf79c6f5
|
am 66425daf: am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
* commit '66425daffc4442693a0dddb6323362877507cc28':
make challengeShowing sticky across bounce.
|
2012-11-08 15:31:42 -08:00 |
|
Jean-Baptiste Queru
|
21fc49ac74
|
Merge commit 'ac20bfe1' into HEAD
|
2012-11-08 14:51:15 -08:00 |
|
Jean-Baptiste Queru
|
c23cfe57a9
|
Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD
|
2012-11-08 14:48:54 -08:00 |
|
Jean-Baptiste Queru
|
87a1ac66ad
|
Merge commit '805337ab5fb2adf108726b351319d77007577bb4' into HEAD
|
2012-11-08 14:48:43 -08:00 |
|
Jean-Baptiste Queru
|
32f504729b
|
Merge commit 'ef44a77f9181c13140c67988356b3ed3f5177434' into HEAD
|
2012-11-08 14:48:36 -08:00 |
|
Jean-Baptiste Queru
|
5189fca3df
|
Merge commit '9a962d7c7df9ff762e3d9798cde868ad73b164db' into HEAD
|
2012-11-08 14:48:28 -08:00 |
|
Jean-Baptiste Queru
|
d931827f86
|
Merge commit '476fceaba3e8c8d5b775fc07ad098792fc757f76' into HEAD
|
2012-11-08 14:44:51 -08:00 |
|
Jean-Baptiste Queru
|
de8717c5f2
|
Merge commit '5418dd92ac6a0e60493ea85d9ac3a0f0d6155908' into HEAD
|
2012-11-08 14:44:44 -08:00 |
|
Jean-Baptiste Queru
|
40a419c2a5
|
Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD
|
2012-11-08 14:44:35 -08:00 |
|
Jean-Baptiste Queru
|
4fb3c16cad
|
Merge commit 'ecf372213db4a1e12f07b4684f3357a838b90daa' into HEAD
|
2012-11-08 14:40:42 -08:00 |
|
Jean-Baptiste Queru
|
d35f576ea0
|
Merge commit 'eead92749924e47ba6758bbded560b6aab0d7485' into HEAD
|
2012-11-08 14:40:34 -08:00 |
|
Jean-Baptiste Queru
|
8d3d0250c4
|
Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11'
Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18
|
2012-11-08 14:40:12 -08:00 |
|
Jean-Baptiste Queru
|
432c71d77e
|
Merge commit '063de3b93e543d9073e14542eb0a60385fd74fa5'
Change-Id: I9ba212785fdb7c3ac92fad33d8a5ff6eefc3c7bc
|
2012-11-08 14:29:45 -08:00 |
|
Jean-Baptiste Queru
|
ce2a3746b8
|
merge 19f8aa180a7ccb29b11a322378002e37517abfc9
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
|
2012-11-08 14:13:21 -08:00 |
|
The Android Open Source Project
|
f4488d0312
|
am a4d8f804: am a8540f2a: Reconcile with jb-mr1-release - do not merge
* commit 'a4d8f804688deb939a37e5aaf0bab40520548b33':
|
2012-11-08 06:27:02 -08:00 |
|
Roman Nurik
|
4b214cddb0
|
am 7a00ac7c: am a93f94d3: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '7a00ac7cb74e957bed6580cc209f8035cd34f58d':
docs: Minor Nexus 10 fix in Device Art Generator
|
2012-11-08 06:26:51 -08:00 |
|
Baligh Uddin
|
c1bd157f50
|
am d98e6dc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'd98e6dc68021dad263783a0f21e3f861589eb694':
Import translations. DO NOT MERGE
|
2012-11-08 06:26:45 -08:00 |
|
Baligh Uddin
|
b7232a2e45
|
am 20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '20040dafbc5f0a0b432d9c41c2da6d7ba7791327':
Import translations. DO NOT MERGE
|
2012-11-08 06:26:41 -08:00 |
|
Svetoslav Ganov
|
f3e03e234f
|
am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit 'dc564945bb7382768e28e45c6fc2452e3f4d9da9':
Make partially visible widget pages not important for accessibility.
|
2012-11-08 06:14:37 -08:00 |
|
Irfan Sheriff
|
37794c200f
|
am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
Stop supplicant and dhcp before start
|
2012-11-08 06:14:33 -08:00 |
|
Sascha Prueter
|
f107bda0ad
|
am a517fc3a: am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit 'a517fc3a393b075a677ef3052e22749951ede8fa':
Use a consistent policy for filtering wake keys.
|
2012-11-08 06:14:25 -08:00 |
|
Romain Guy
|
a965fc5e8f
|
am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
* commit 'b37e5d756f04489ff95226e26ebfdf141d135f91':
Dismiss error icon on setError(null) [regression] Bug #7442935
|
2012-11-08 06:14:11 -08:00 |
|
Eino-Ville Talvala
|
f4334f63c5
|
am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '9671e6e116bbb8a82784457382cab3f90289e31b':
Camera: Document new video snapshot picture size behavior.
|
2012-11-08 06:14:01 -08:00 |
|
Victoria Lease
|
44d927ca83
|
am 66f3d7f3: am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '66f3d7f3c8247b59516cbc4ad13bea4e0b8c0ef9':
Fires geofence if the device is already in the geofence area.
|
2012-11-08 06:13:21 -08:00 |
|
Robert Greenwalt
|
744c520472
|
am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
* commit '08db1ceba24925cd8a710aa0153519351a9fa2c7':
Add Coin graphic to premium-sms dialog.
|
2012-11-08 06:13:17 -08:00 |
|
The Android Open Source Project
|
7139007202
|
am 927372ae: am f3456803: Reconcile with jb-mr1-release - do not merge
* commit '927372aec399b7c63d193c57c69b57065e7b66e5':
|
2012-11-08 06:12:45 -08:00 |
|
Justin Koh
|
4608a0aec2
|
am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
* commit '41048d670d42075732723e72d7f303498690ea99':
Support new touchpad event protocol.
|
2012-11-08 06:12:30 -08:00 |
|
Justin Koh
|
a1459793d4
|
am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
* commit '58e0fb9adbe579a068849a7865a7f1bce7531d1c':
Trigger Google Now intent with swipe from bottom
|
2012-11-08 06:12:26 -08:00 |
|
Amith Yamasani
|
cb5cb740b5
|
am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit 'aecee8a98543118dacec14a94052243754560e9d':
Authenticate correct user's account when pattern fails multiple times.
|
2012-11-08 06:12:21 -08:00 |
|
John Spurlock
|
805337ab5f
|
resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp
Change-Id: Iad4319796be4b9ad74580f8c20a4e8cb30569f87
|
2012-11-08 07:43:15 -05:00 |
|
John Spurlock
|
9a962d7c7d
|
am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition.
* commit '64091a1da0e87937ad42c8ae0d5e3dd3913b297b':
Fix regression in camera transition.
|
2012-11-07 15:06:45 -08:00 |
|
Michael Jurka
|
e4cc20d114
|
am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
* commit '7dfbe2d6a7a3d6f11d522f44b5339c7a6d3f2a1b':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
|
2012-11-07 15:06:41 -08:00 |
|
Jim Miller
|
449f48ff3b
|
am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
Workaround for layout bug in SIM PIN/PUK views
|
2012-11-07 15:06:37 -08:00 |
|
Jim Miller
|
d3bd6eb8b2
|
am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
* commit '16ddf343a61dfc93ff9a6fc4721b8fb16010da48':
Fix NPE caused by applications that try to hide keyguard while it's not showing
|
2012-11-07 15:06:33 -08:00 |
|
Svetoslav Ganov
|
63121bd6c1
|
am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
* commit 'ab77b5e6a251075fdfc7990f4d34a8d5896cfbce':
|
2012-11-07 15:06:29 -08:00 |
|
Mike Cleron
|
fe583a7024
|
am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
* commit 'd97d16f0d1693657938a9c08099ad352d0946b6f':
|
2012-11-07 15:06:26 -08:00 |
|
Romain Guy
|
39fe96c7b8
|
am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
* commit 'c4101b2b96d7958e26da5a7b3d14cc2540f8002a':
|
2012-11-07 15:06:22 -08:00 |
|
Jean-Baptiste Queru
|
476fceaba3
|
Merge 5418dd92
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
|
2012-11-07 14:41:18 -08:00 |
|
Kenny Root
|
58ed5d748c
|
am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
|
2012-11-07 11:52:12 -08:00 |
|
Kenny Root
|
768d9e1a72
|
Merge "Correct executable bit for source files"
|
2012-11-07 11:45:14 -08:00 |
|
Adam Powell
|
f2d7c67f94
|
am de565f3b: am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
* commit 'de565f3bcbae9bf8643650b9c20abe67252629d6':
Keyguard - MultiPaneChallengeLayout measurement/layout changes
|
2012-11-07 11:17:22 -08:00 |
|