Irfan Sheriff
|
91b50e2de7
|
am 523abc22: am 6d9c1c26: am 503be131: am 61e42262: Fix group join CTS test
* commit '523abc22964285b91e1bbd99eb71eb261fdc8402':
|
2012-10-26 18:19:26 -07:00 |
|
Fabrice Di Meglio
|
bcefac5bb2
|
am 92c0c5df: am 05671189: am 68a9e6d2: am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
* commit '92c0c5df6549b2330a8693cd008787630b1b1d2e':
|
2012-10-26 18:19:22 -07:00 |
|
Jeff Sharkey
|
7a8c19fa31
|
am cb0a030f: am ab33d668: am 17671ff0: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
* commit 'cb0a030f97f3e6972ea2e6a895dfe95b07fe3261':
|
2012-10-26 18:19:18 -07:00 |
|
John Spurlock
|
34391e7cce
|
am 93fb8ad1: am 629e0dcb: am fd88c257: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
* commit '93fb8ad1182d959aaf1023911f59a3a6b6509889':
|
2012-10-26 18:19:14 -07:00 |
|
Romain Guy
|
e41836ff3d
|
am 6956ffae: am fa04a22e: am ede74090: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev
* commit '6956ffae7d16af7ac0b39dc0a361d6aeecad47ac':
|
2012-10-26 18:19:11 -07:00 |
|
Craig Mautner
|
7014024839
|
am bae3463f: am 7613563c: am 561253f0: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
* commit 'bae3463fcd9de0c36287eae7b1d8948351515dac':
|
2012-10-26 18:19:07 -07:00 |
|
Michael Jurka
|
85d56e91ef
|
am bdb7f63b: am d3352bc9: am 54030065: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
* commit 'bdb7f63b4152bbc807666cd8b81166463e869f44':
|
2012-10-26 18:19:04 -07:00 |
|
Michael Jurka
|
dd7a9d94dd
|
am 3cba6737: am 54c7f0b2: am 2275482b: am 80343f64: Fix recents animations for secondary users
* commit '3cba6737a2dba135aad661e3e8556c4c3388b141':
|
2012-10-26 18:19:00 -07:00 |
|
Geremy Condra
|
e55cd0de59
|
am c49403e5: am 76c9f3e0: am b81cedad: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
* commit 'c49403e5a21b9bb368cb0c4b1e6575f72fbc50fe':
|
2012-10-26 18:18:56 -07:00 |
|
Jeff Brown
|
a8871150b8
|
am 15fba04b: am bdf4c8ce: am c4070bbd: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
* commit '15fba04b1d08f396b9eddcb019a5b734f73b52c0':
|
2012-10-26 18:18:53 -07:00 |
|
Jeff Sharkey
|
00c067aa87
|
am 148b2dcb: am e2243c89: am 9254d310: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
* commit '148b2dcba7b8f3bc55aa238cb12232706ee3c18b':
|
2012-10-26 18:18:49 -07:00 |
|
Jeff Brown
|
364bc58b37
|
am 0612277c: am bd255459: am c6275f58: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
* commit '0612277c15f4ed9937c842913a830eb000717858':
|
2012-10-26 18:18:45 -07:00 |
|
Dave Burke
|
f68bdc2233
|
am 8830eebc: am 13d46256: am 2a808f97: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
* commit '8830eebc26c6a0279b1927013f8a0350fc497690':
|
2012-10-26 18:18:42 -07:00 |
|
Xavier Ducrohet
|
23a8ab4de4
|
am 70dda92a: (-s ours) am 3a4fa221: am 8855ba62: am ed5387be: (-s ours) am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
* commit '70dda92a16a630471a8269867b26777d0d7854c3':
|
2012-10-26 18:18:38 -07:00 |
|
Fabrice Di Meglio
|
25eb6733d5
|
am e3b31fee: am cd94777f: am afb856f2: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
* commit 'e3b31feebe955471064f4659311726c333f0de2c':
|
2012-10-26 18:18:34 -07:00 |
|
Fabrice Di Meglio
|
4486e4dc3b
|
am 81bed251: am 57cfcfc8: am 7fb1aac6: am 0437302f: Merge "Fix the build" into jb-mr1-dev
* commit '81bed251124cf0ea1f0d331a45a875abe379e012':
|
2012-10-26 18:18:29 -07:00 |
|
Xavier Ducrohet
|
77d1a12306
|
am 16261ba8: am fcfc549e: am ac7806b9: am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
* commit '16261ba89f9f8729647955cd3c44e5d1e6d217cb':
|
2012-10-26 18:18:25 -07:00 |
|
Fabrice Di Meglio
|
5f39ef02a5
|
am 10a6d6e3: am 0b025ca7: am 78c66c99: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
* commit '10a6d6e30fa966d9b9c204e4b9af13ac68c466ec':
|
2012-10-26 18:18:20 -07:00 |
|
Svetoslav Ganov
|
210f2f7dc2
|
am 9aafa473: am 748ab7f2: am 34130c86: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
* commit '9aafa473ab4583b4bb479c65556735270a7e3a9e':
|
2012-10-26 18:18:16 -07:00 |
|
Craig Mautner
|
7373f45cbf
|
am fe9bd871: am 2d9f13cf: am b05e449b: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
* commit 'fe9bd87106a7974e068f02486d3525667e4763e8':
|
2012-10-26 18:18:12 -07:00 |
|
Irfan Sheriff
|
6c90b0e372
|
am 66be661c: am f1aabd93: am d895caf7: am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev
* commit '66be661c459e3bc24215fe14c613eb98c24cd6e1':
|
2012-10-26 18:18:09 -07:00 |
|
Chet Haase
|
6d1d37ac24
|
am 74a41fb5: am e7564bd6: am e114fcc7: am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
* commit '74a41fb5242998beacf8fe13c733ab35615853ce':
|
2012-10-26 18:18:05 -07:00 |
|
Jeff Hamilton
|
50a508bb92
|
am 5f397461: am 3be4c86c: am d76ba621: am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
* commit '5f397461ab519ff012937b0079e5bb70b5d2ff53':
|
2012-10-26 18:18:01 -07:00 |
|
Scott Main
|
2b3379b504
|
am 4018b220: am d5bef5dd: am 4e2e6dfd: am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
* commit '4018b220f1c3f530603937b9ba75afd35ef938ed':
|
2012-10-26 18:17:57 -07:00 |
|
Xavier Ducrohet
|
cd0549fac4
|
am 38cb7725: (-s ours) am aa3770fb: am e8c9ce73: am 5e42147a: (-s ours) am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
* commit '38cb77254ac6f81a36b4f72dcae1db37a2762644':
|
2012-10-26 18:17:53 -07:00 |
|
Christopher Tate
|
86fb11b889
|
am fd8c61b4: am 9de39197: am 32202893: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
* commit 'fd8c61b46ef7b73af42a082b51909b59535e95bd':
|
2012-10-26 18:17:50 -07:00 |
|
Scott Main
|
a9b200a2a9
|
am 4d7df836: am b2f81b8c: am c88e9184: am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
* commit '4d7df836d2db486f0991c2e40d3271b7a12263ed':
|
2012-10-26 18:17:46 -07:00 |
|
Chet Haase
|
266e23a827
|
am 81514647: am 89824595: am 4bcf8740: am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
* commit '8151464782b2e87aa279679b4eb6355374732960':
|
2012-10-26 18:17:42 -07:00 |
|
Victoria Lease
|
598d55dcd0
|
am 8ff3586c: am ff33a010: am 645a16fb: am 588fb15d: Merge "LocationManager permissions cleanup" into jb-mr1-dev
* commit '8ff3586c5bf5c6bd924002e0d315dbf55e65ddea':
|
2012-10-26 18:17:39 -07:00 |
|
Amith Yamasani
|
5160492ad2
|
am a42bcce8: am 061bcd27: am 868f82ae: am 0141faec: Merge "Allow services to query the info for a dying user." into jb-mr1-dev
* commit 'a42bcce8ac47b7208951c89bbbc136ba70213be7':
|
2012-10-26 18:17:35 -07:00 |
|
Daniel Sandler
|
470e109bd7
|
am e3002155: am 40fae0bb: am f400513d: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
* commit 'e300215503b9166af8305f15fcd5ed78d4b2ae5b':
|
2012-10-26 18:17:31 -07:00 |
|
Michael Jurka
|
48149e869b
|
am 27f80826: am 7fa48e69: am faa82590: am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
* commit '27f8082651defa70551a56b328d18ac7a24dfe47':
|
2012-10-26 18:17:27 -07:00 |
|
Daniel Sandler
|
6ee5021223
|
am b15ff37f: am 4db77891: am 3f846089: am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
* commit 'b15ff37fbbda7676d95147279a59ba5d25aa23bb':
|
2012-10-26 18:17:23 -07:00 |
|
Jeff Brown
|
1a8f64563b
|
am 6664a94b: am 335b606c: am 0ad3bb8b: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
* commit '6664a94b9922903bc102934d3e4e8956e22d3654':
|
2012-10-26 18:17:19 -07:00 |
|
Jeff Brown
|
ef283e9c15
|
am 6d6463c9: am 61c3629c: am 80ffd26f: am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
* commit '6d6463c92e1e6ee3f9acb19057df25712fa7f89c':
|
2012-10-26 18:17:16 -07:00 |
|
Jeff Sharkey
|
8ddfae5d4b
|
am f8d6a0bf: am a57f443a: am e21a2e72: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
* commit 'f8d6a0bf8601a6457bbb5af541e3c763fba2d418':
|
2012-10-26 18:17:12 -07:00 |
|
Baligh Uddin
|
83d7426799
|
am 9ce37a5e: (-s ours) am 45a4aff0: (-s ours) am 2fa64ac6: am 3e336bd6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '9ce37a5ec0ccde58ab73b05a60213657d0bb1d4d':
|
2012-10-26 18:17:08 -07:00 |
|
Irfan Sheriff
|
523abc2296
|
am 6d9c1c26: am 503be131: am 61e42262: Fix group join CTS test
* commit '6d9c1c26760c49a99dd083ca766ce76871ff12ce':
|
2012-10-26 18:14:06 -07:00 |
|
Fabrice Di Meglio
|
92c0c5df65
|
am 05671189: am 68a9e6d2: am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
* commit '056711898760f9b40dd206a875e285173e952f0f':
|
2012-10-26 18:14:03 -07:00 |
|
Jeff Sharkey
|
cb0a030f97
|
am ab33d668: am 17671ff0: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
* commit 'ab33d668ff5bb4466c58d6ab5457080cfe76ff07':
|
2012-10-26 18:13:59 -07:00 |
|
John Spurlock
|
93fb8ad118
|
am 629e0dcb: am fd88c257: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
* commit '629e0dcb3948f89a9acb02aca9f2de1c31d7e7c6':
|
2012-10-26 18:13:56 -07:00 |
|
Romain Guy
|
6956ffae7d
|
am fa04a22e: am ede74090: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev
* commit 'fa04a22ee53e422bdb2aa079876ac69faa59cbdd':
|
2012-10-26 18:13:50 -07:00 |
|
Craig Mautner
|
bae3463fcd
|
am 7613563c: am 561253f0: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
* commit '7613563c0caa812aed6213b225754db80e5b9b11':
|
2012-10-26 18:13:46 -07:00 |
|
Michael Jurka
|
bdb7f63b41
|
am d3352bc9: am 54030065: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
* commit 'd3352bc9eb44782fbfd807dc6ae3ac434a4c03cd':
|
2012-10-26 18:13:43 -07:00 |
|
Michael Jurka
|
3cba6737a2
|
am 54c7f0b2: am 2275482b: am 80343f64: Fix recents animations for secondary users
* commit '54c7f0b21bffdcb2a0e3b6017ffcda005dac3495':
|
2012-10-26 18:13:39 -07:00 |
|
Geremy Condra
|
c49403e5a2
|
am 76c9f3e0: am b81cedad: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
* commit '76c9f3e0c61c39f44421546b24e6b6bfd5cd48ad':
|
2012-10-26 18:13:36 -07:00 |
|
Jeff Brown
|
15fba04b1d
|
am bdf4c8ce: am c4070bbd: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
* commit 'bdf4c8ce5a2011f3a1ab6c0bf8037a8b60d26834':
|
2012-10-26 18:13:33 -07:00 |
|
Jeff Sharkey
|
148b2dcba7
|
am e2243c89: am 9254d310: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
* commit 'e2243c89cdaaaade144448a03da336b120aeb0e4':
|
2012-10-26 18:13:29 -07:00 |
|
Jeff Brown
|
0612277c15
|
am bd255459: am c6275f58: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
* commit 'bd25545961ea7ac14b92bbf5fe151b09c2e7e12f':
|
2012-10-26 18:13:24 -07:00 |
|
Dave Burke
|
8830eebc26
|
am 13d46256: am 2a808f97: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
* commit '13d462564b0267f4736b2b1fdf01f782f4ebe9a1':
|
2012-10-26 18:13:21 -07:00 |
|