Adam Powell
|
f423fbc78e
|
am 412545f7: am f2d7c67f: am de565f3b: am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
* commit '412545f7f05f15ed0c2a6c98f1221b48bf28f11c':
Keyguard - MultiPaneChallengeLayout measurement/layout changes
|
2012-11-08 15:37:18 -08:00 |
|
Victoria Lease
|
8bfe33cb12
|
am e006945d: 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 'e006945d34e9149796612768911d7c8bfd8d15ee':
|
2012-11-08 15:37:14 -08:00 |
|
Chris Wren
|
b3e2d832a7
|
am e2b6a935: am f5dc0a19: am 888322a6: am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev
* commit 'e2b6a935962b2697d4b9896188449d94a79d8331':
animating challenge closed should close the challenge.
|
2012-11-08 15:37:10 -08:00 |
|
Winson Chung
|
c05ad9a293
|
am b10df88b: am 267214f4: am 43ecd191: am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions.
* commit 'b10df88b0279355593b0ef8ccae5e4e9853236e1':
Using screen dimensions to calculate the expanded PagedView dimensions.
|
2012-11-08 15:37:06 -08:00 |
|
Jim Miller
|
d97b09b0f3
|
am bef82757: am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
* commit 'bef827572ce9644253ea42ab91b11b8107d2300f':
Add isSafeModeEnabled() API to WindowManagerService
|
2012-11-08 15:37:01 -08:00 |
|
Danielle Millett
|
8cd2f5bc64
|
am 6b646e82: am ae54cd6e: am 2f4be247: am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev
* commit '6b646e82050c4364b400c1780b70131eea200439':
Removing callbacks in onDetachedFromWindow, fixes b/7465673
|
2012-11-08 15:36:54 -08:00 |
|
Adam Cohen
|
057c5390c5
|
am 4d6d5f18: am e5785461: am 441d3401: am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
* commit '4d6d5f185c6b09e5d82ab9ee59539b9a96322004':
Making sure the sticky widget logic works with music
|
2012-11-08 15:36:50 -08:00 |
|
Adam Cohen
|
1c2576ae18
|
am 1b19b519: am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
* commit '1b19b519e659783236661fecf22f4f8897742dc3':
Attempted fix for issue 7469415
|
2012-11-08 15:36:45 -08:00 |
|
Amith Yamasani
|
77e168461b
|
am fda301cf: am 9862ac9c: am 22559dc5: am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit 'fda301cf7590efa6cfbbce66b8693093c3be69e2':
|
2012-11-08 15:36:38 -08:00 |
|
Chris Wren
|
f62039370a
|
am abbf79c6: am 66425daf: am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
* commit 'abbf79c6f5319d826d5b93b0e186d8429a78b903':
make challengeShowing sticky across bounce.
|
2012-11-08 15:36:35 -08:00 |
|
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
|
7c8d2b63c0
|
Merge from jb-mr1-dev-plus-aosp
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
|
2012-11-08 15:19:11 -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
|
cf27115ae1
|
am f4488d03: (-s ours) am a4d8f804: am a8540f2a: Reconcile with jb-mr1-release - do not merge
* commit 'f4488d0312bd5a1af03b8c353bfe0c1f0e836f33':
|
2012-11-08 06:29:54 -08:00 |
|
Roman Nurik
|
4d691a37d3
|
am 4b214cdd: am 7a00ac7c: am a93f94d3: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '4b214cddb0be3d988b2334898279923ec29ec3f1':
docs: Minor Nexus 10 fix in Device Art Generator
|
2012-11-08 06:29:50 -08:00 |
|
Baligh Uddin
|
cc7dde8c6f
|
am c1bd157f: (-s ours) am d98e6dc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'c1bd157f50472a96025721e26e697b33c6f44b5b':
Import translations. DO NOT MERGE
|
2012-11-08 06:29:46 -08:00 |
|
Baligh Uddin
|
28f4c3d546
|
am b7232a2e: (-s ours) am 20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'b7232a2e45d5b113334915ff7d94636f6ddfb807':
Import translations. DO NOT MERGE
|
2012-11-08 06:29:42 -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
|
a083599a75
|
am f3e03e23: am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit 'f3e03e234f47a85ba25d7a0038253951e94df3b8':
Make partially visible widget pages not important for accessibility.
|
2012-11-08 06:18:51 -08:00 |
|
Irfan Sheriff
|
8449bb0378
|
am 37794c20: am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit '37794c200fa24e622d842d420b49a2a2a87a38bb':
Stop supplicant and dhcp before start
|
2012-11-08 06:18:47 -08:00 |
|
Sascha Prueter
|
06a5aaa8f8
|
am f107bda0: am a517fc3a: am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit 'f107bda0ad3c16dfc85cd2119445e63a937be6bd':
Use a consistent policy for filtering wake keys.
|
2012-11-08 06:18:43 -08:00 |
|
Romain Guy
|
18d9a26941
|
am a965fc5e: am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
* commit 'a965fc5e8f0c84cbeeaae7006eddbaf3bba64586':
Dismiss error icon on setError(null) [regression] Bug #7442935
|
2012-11-08 06:18:40 -08:00 |
|
Eino-Ville Talvala
|
f0352e03fd
|
am f4334f63: am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit 'f4334f63c5162035ead3b44131c48015dfc6be58':
Camera: Document new video snapshot picture size behavior.
|
2012-11-08 06:18:36 -08:00 |
|
Victoria Lease
|
eeaf165a5f
|
am 44d927ca: am 66f3d7f3: am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '44d927ca837f03e99a4dda52377275da2863ecbb':
Fires geofence if the device is already in the geofence area.
|
2012-11-08 06:18:31 -08:00 |
|
Robert Greenwalt
|
1f030df226
|
am 744c5204: am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
* commit '744c520472d59c59f5320e1b0cf0801418eba773':
Add Coin graphic to premium-sms dialog.
|
2012-11-08 06:18:25 -08:00 |
|
The Android Open Source Project
|
99e61610c4
|
am 71390072: (-s ours) am 927372ae: am f3456803: Reconcile with jb-mr1-release - do not merge
* commit '71390072023ec559b88f7a06111ffb458d8880f9':
|
2012-11-08 06:18:20 -08:00 |
|