OSDN Git Service
Dave Burke [Mon, 29 Oct 2012 19:45:41 +0000 (12:45 -0700)]
am
4d56a167: am
799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev
* commit '
4d56a16728b21b2825500c24b5af1b4e0573a15e':
Eric Laurent [Mon, 29 Oct 2012 19:45:37 +0000 (12:45 -0700)]
am
22df26ca: am
f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev
* commit '
22df26cac2e9a2215e7a8af9f1b7444aac08992d':
Kenny Root [Mon, 29 Oct 2012 19:45:34 +0000 (12:45 -0700)]
am
16106a76: am
92bc9b31: PMS: check outInfo for null during delete
* commit '
16106a7641bac1590476459d9e349ab18f4ca44c':
Dianne Hackborn [Mon, 29 Oct 2012 19:45:30 +0000 (12:45 -0700)]
am
a4dcf311: am
56e75631: Merge "Fix issue #
7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev
* commit '
a4dcf311c1955108e0b81e9dcd48723acde1acca':
Svetoslav Ganov [Mon, 29 Oct 2012 19:45:24 +0000 (12:45 -0700)]
am
40ca868a: am
e1655c98: (-s ours) Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev
* commit '
40ca868a08e2c764a206a5e32b7e9af46fd168da':
John Spurlock [Mon, 29 Oct 2012 19:45:17 +0000 (12:45 -0700)]
am
86b6357e: Manual f/b merge of lockhotness camera integration.
* commit '
86b6357e5eb91950eac7de7ffe29e5a4ad32903b':
Manual f/b merge of lockhotness camera integration.
Adam Powell [Mon, 29 Oct 2012 19:45:13 +0000 (12:45 -0700)]
am
848a5557: Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev
* commit '
848a5557dba25defd5f332ebc20b61d0097f27f0':
Fix up GlowPadView attributes
Jim Miller [Mon, 29 Oct 2012 19:45:09 +0000 (12:45 -0700)]
am
19a52670: Merge latest prototype changes into keyguard
* commit '
19a5267003e7dc70100a4bd4f1f449523b2ff38b':
Merge latest prototype changes into keyguard
Kenny Root [Mon, 29 Oct 2012 19:45:06 +0000 (12:45 -0700)]
am
356f2f59: am
da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev
* commit '
356f2f59410be228cfb60ccc3c1878c8ba99da07':
Craig Mautner [Mon, 29 Oct 2012 19:45:02 +0000 (12:45 -0700)]
am
ce1696c2: am
6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
* commit '
ce1696c22a2fab8c3df63fd504a844f3fccd6cfc':
Hiroshi Lockheimer [Mon, 29 Oct 2012 19:44:58 +0000 (12:44 -0700)]
Chet Haase [Mon, 29 Oct 2012 19:44:54 +0000 (12:44 -0700)]
am
4a4ae0b7: am
fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev
* commit '
4a4ae0b7e2d41cac79a97f1e91ba5ed4c632df1f':
Romain Guy [Mon, 29 Oct 2012 19:44:49 +0000 (12:44 -0700)]
am
aae03bb4: am
b75ade9c: Merge "Use existing display list to render the resize buffer Bug #
7400903" into jb-mr1-dev
* commit '
aae03bb4e3e0d4c64390dc9ff4eca08a4ca6d0b7':
Danielle Millett [Mon, 29 Oct 2012 19:44:46 +0000 (12:44 -0700)]
am
7c420ec6: Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev
* commit '
7c420ec69843c8efc95b4f36aa77f17d970d4eaf':
Handling popups correctly for face unlock
Jamie Gennis [Mon, 29 Oct 2012 19:44:42 +0000 (12:44 -0700)]
am
0e259dcc: am
cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
* commit '
0e259dccfc77a83ce91b0a2770d26e6b88bfd52b':
Andy McFadden [Mon, 29 Oct 2012 19:44:38 +0000 (12:44 -0700)]
am
2eb8303b: am
d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev
* commit '
2eb8303b9c60104720a0d81040337409dfab4cbe':
Michael Jurka [Mon, 29 Oct 2012 19:44:33 +0000 (12:44 -0700)]
am
cd57bdb5: am
a665df57: Merge "Use lighter background for Recents" into jb-mr1-dev
* commit '
cd57bdb57a9f7ddf5b394ba1d59024d38d86fb23':
Jason Simmons [Mon, 29 Oct 2012 18:24:11 +0000 (11:24 -0700)]
resolved conflicts for merge of
83b9647d to jb-mr1-aah-dev
Change-Id: Ic6d9435cf6c86a8048a99488d2e1dab49b4454c6
Jeff Brown [Mon, 29 Oct 2012 16:25:21 +0000 (09:25 -0700)]
am
f33ff923: am
6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
* commit '
f33ff923139dd7427b84726deaf919e847aac9f5':
Chris Wren [Mon, 29 Oct 2012 16:25:16 +0000 (09:25 -0700)]
am
3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev
* commit '
3867ddabbe645749ba3d7db9fc0c0ab9ca84690b':
merge new multiuser avatars in from proto app
Baligh Uddin [Mon, 29 Oct 2012 16:25:12 +0000 (09:25 -0700)]
am
1afe7788: am
8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
1afe77883e1ad2f79942a5d14b618a31d4643abc':
Baligh Uddin [Mon, 29 Oct 2012 16:25:08 +0000 (09:25 -0700)]
am
22f91da2: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
22f91da2c2da04d759f329fc69a5f7c0741c0218':
Import translations. DO NOT MERGE
Romain Guy [Mon, 29 Oct 2012 16:25:04 +0000 (09:25 -0700)]
am
0472d565: am
04c8d402: Merge "Properly draw the window background on window resize Bug #
7385090" into jb-mr1-dev
* commit '
0472d565f3005a2cae07e18ce83947a5ad300613':
Irfan Sheriff [Mon, 29 Oct 2012 16:25:00 +0000 (09:25 -0700)]
am
086dc1ce: am
c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
* commit '
086dc1ce9ba175c30976e5979395cf0e8c1ca9ae':
Baligh Uddin [Mon, 29 Oct 2012 16:24:56 +0000 (09:24 -0700)]
am
bd28f237: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
bd28f2376f8f6960c1cd7d695a16b90450fa04f2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 16:21:05 +0000 (09:21 -0700)]
am
66e893fb: (-s ours) am
21ce854b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
66e893fb9bd0b0e4f6df5e3c58e19930fc57d49b':
Daniel Sandler [Mon, 29 Oct 2012 16:17:07 +0000 (09:17 -0700)]
am
79db4800: am
365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '
79db48003b3e9a482cf45764c92bc2100e00df4f':
Justin Ho [Mon, 29 Oct 2012 16:17:03 +0000 (09:17 -0700)]
am
c1c03c42: am
5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
* commit '
c1c03c429a9d1b5ebe7643bfb95675513e1d25df':
Irfan Sheriff [Mon, 29 Oct 2012 16:16:59 +0000 (09:16 -0700)]
am
5f8e3f2b: am
bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev
* commit '
5f8e3f2b36ae0d85bd73778a6287b6fdfa1c7a04':
Jeff Sharkey [Mon, 29 Oct 2012 16:16:56 +0000 (09:16 -0700)]
am
32a1c5f7: am
1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
* commit '
32a1c5f7d6266942930306a5602172e47726c869':
Daniel Sandler [Mon, 29 Oct 2012 16:16:52 +0000 (09:16 -0700)]
am
cf64067c: am
0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
* commit '
cf64067c95a83d56381ff62c9222098f314b949a':
John Spurlock [Mon, 29 Oct 2012 16:16:49 +0000 (09:16 -0700)]
am
31821c5b: am
780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
* commit '
31821c5b6170d5f560c7f74b262278399c9ff3e9':
Jim Miller [Mon, 29 Oct 2012 16:16:45 +0000 (09:16 -0700)]
am
5d3f8599: Merge multi-user stuff from prototype into framework.
* commit '
5d3f8599590026d6fc275739613fe6ddb180af55':
Merge multi-user stuff from prototype into framework.
Jim Miller [Mon, 29 Oct 2012 16:16:41 +0000 (09:16 -0700)]
am
022554e3: Merge latest prototype changes into keyguard
* commit '
022554e3da6e496524387a5d3ecc67ef9749b587':
Merge latest prototype changes into keyguard
Jim Miller [Mon, 29 Oct 2012 16:16:37 +0000 (09:16 -0700)]
am
c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev
* commit '
c28261d4fabf186cd5af5a563e6bab9023ee3758':
Wire up "add widget" in keyguard
erin rosenthal [Mon, 29 Oct 2012 16:16:33 +0000 (09:16 -0700)]
am
9415aa1c: am
36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
* commit '
9415aa1c1b51f82a73ddc669771d850304cc704c':
Eric Laurent [Mon, 29 Oct 2012 16:16:30 +0000 (09:16 -0700)]
am
d691056c: am
3ac692f5: Merge "reduce camera sound volume." into jb-mr1-dev
* commit '
d691056ca86b07176b2bf2f9abc3cf996b61f6f1':
Jim Miller [Mon, 29 Oct 2012 16:16:26 +0000 (09:16 -0700)]
am
08697709: Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
* commit '
086977094d96ab9352432e0941a05b09cefc92ac':
Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
Amith Yamasani [Mon, 29 Oct 2012 16:16:22 +0000 (09:16 -0700)]
am
8e6dcb00: am
0b828ee0: Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
* commit '
8e6dcb0045a5085cb41beb6f66977ba664847d4b':
Michael Jurka [Mon, 29 Oct 2012 16:16:18 +0000 (09:16 -0700)]
am
5419ae87: am
4ce82df5: Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
* commit '
5419ae873db25f83967a6ca65b6e546e7da4afce':
Kenny Root [Mon, 29 Oct 2012 16:16:14 +0000 (09:16 -0700)]
am
8af55c66: am
e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
* commit '
8af55c660df4688c73cc0433efac22970434731a':
Raph Levien [Mon, 29 Oct 2012 16:16:10 +0000 (09:16 -0700)]
am
9ed957c2: am
74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
* commit '
9ed957c20f0e491f1fa4624fab6ca8649ac86f28':
Chet Haase [Mon, 29 Oct 2012 16:16:02 +0000 (09:16 -0700)]
am
8f87ea2d: am
74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
* commit '
8f87ea2da6fc57427e30e21be90047a820dc2adf':
Baligh Uddin [Mon, 29 Oct 2012 16:15:58 +0000 (09:15 -0700)]
am
acba3808: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
acba3808357d5c4f9660ae7144bd2d0fe836469f':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 16:15:54 +0000 (09:15 -0700)]
am
d046acd7: am
5be59670: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
d046acd735de25142aaef3ccce616073460e2584':
Colin Cross [Mon, 29 Oct 2012 16:15:51 +0000 (09:15 -0700)]
am
899b3d9a: am
034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
* commit '
899b3d9acaab91ba230ba04ddd7560f44886faef':
Jamie Gennis [Mon, 29 Oct 2012 16:15:47 +0000 (09:15 -0700)]
am
167cd3e3: am
23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
* commit '
167cd3e36700e772392207ad69e42a868cc94808':
Svetoslav Ganov [Mon, 29 Oct 2012 16:15:40 +0000 (09:15 -0700)]
am
047ceab5: am
d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug:
7362316" into jb-mr1-dev
* commit '
047ceab558632aff281c8def25f168f35f1a69f5':
Victoria Lease [Mon, 29 Oct 2012 16:15:36 +0000 (09:15 -0700)]
am
2e2f8508: am
92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
* commit '
2e2f8508eec6cb08326ce528d939554512db6acd':
Amith Yamasani [Mon, 29 Oct 2012 16:15:32 +0000 (09:15 -0700)]
am
aad8cd4d: am
22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
* commit '
aad8cd4daa6cd1d354e0c1de03ce5a65a44a04db':
Adam Powell [Mon, 29 Oct 2012 16:15:29 +0000 (09:15 -0700)]
am
a6ea59ef: am
cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
* commit '
a6ea59ef4929826757796660340b0be541f1a838':
Daniel Sandler [Mon, 29 Oct 2012 16:15:25 +0000 (09:15 -0700)]
am
cedb7095: am
a4be1b2b: Merge "Fix empty notification panel." into jb-mr1-dev
* commit '
cedb7095a01552568a5dc63e3d89ea6c9be2a5ee':
Daniel Sandler [Mon, 29 Oct 2012 16:15:21 +0000 (09:15 -0700)]
am
c613a062: am
564c03da: Merge "Really hide the settings button on tablets." into jb-mr1-dev
* commit '
c613a062f17e449743c253e9a6ffc5f3f231d20a':
Michael Jurka [Mon, 29 Oct 2012 16:15:17 +0000 (09:15 -0700)]
am
164497d6: am
39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
* commit '
164497d6712fd6257821f6663a00b5db0e8472d4':
Baligh Uddin [Mon, 29 Oct 2012 16:15:13 +0000 (09:15 -0700)]
am
55fb1ab5: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
55fb1ab5ffa794d4e183f9281d2f8933b9f3845a':
Import translations. DO NOT MERGE
Jeff Brown [Mon, 29 Oct 2012 16:15:09 +0000 (09:15 -0700)]
am
1ab678ba: am
d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev
* commit '
1ab678ba71ac0b85f4c77542e59c59f7dd07d424':
Dianne Hackborn [Mon, 29 Oct 2012 16:15:05 +0000 (09:15 -0700)]
am
a582c508: am
f584f111: Merge "Fix issue #
7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
* commit '
a582c5081b2775eb0ab59ff9c8332f3f8ccf5361':
Baligh Uddin [Mon, 29 Oct 2012 16:15:00 +0000 (09:15 -0700)]
am
ad0bda19: am
e53f5265: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
ad0bda19947e685f7e00bfbfad9128649e6f44dd':
Baligh Uddin [Mon, 29 Oct 2012 16:15:00 +0000 (09:15 -0700)]
am
e570c9c6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
e570c9c6f47ebfebcfd21194f6362e954b45245d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 00:30:51 +0000 (17:30 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Sun, 28 Oct 2012 17:37:53 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I252feb4a5dda101a56609fff1d17447375250153
Auto-generated-cl: translation import
Baligh Uddin [Sun, 28 Oct 2012 17:14:37 +0000 (10:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifec8cc64e9047964d26ac167583e81949d7f4826
Auto-generated-cl: translation import
Daniel Sandler [Fri, 26 Oct 2012 22:24:42 +0000 (15:24 -0700)]
am
17d237e1: am
cc0106cd: Merge "Properly show emoji in the notification ticker." into jb-mr1-dev
* commit '
17d237e1de4398a8045da2cdcb047c1fd862f8d4':
Daniel Sandler [Fri, 26 Oct 2012 22:24:38 +0000 (15:24 -0700)]
am
a33079c7: am
3c84c9bc: Merge "Show brightness dialog for all users." into jb-mr1-dev
* commit '
a33079c7bc2a6a33341fe2560ae3c61442cf56de':
Daniel Sandler [Fri, 26 Oct 2012 22:24:34 +0000 (15:24 -0700)]
am
363a119c: am
2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
* commit '
363a119c5292fbc1c25ce8ced09ee4da239fb40d':
Jim Miller [Fri, 26 Oct 2012 22:24:28 +0000 (15:24 -0700)]
am
d6523da1: Merge latest prototype changes into the framework
* commit '
d6523da1ad7bae805a3dbea8d7b398d86cd3c181':
Merge latest prototype changes into the framework
Amith Yamasani [Fri, 26 Oct 2012 22:24:24 +0000 (15:24 -0700)]
am
596f143f: am
8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
* commit '
596f143fa659e2c9416a5b1a26e8b3064002c9cf':
Dirk Dougherty [Fri, 26 Oct 2012 22:24:19 +0000 (15:24 -0700)]
am
9bd62847: am
7707b050: am
454248f0: am
e25c241b: am
6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
* commit '
9bd62847b835f2d30a476483148269cbef5681ad':
Jim Miller [Fri, 26 Oct 2012 22:24:15 +0000 (15:24 -0700)]
am
28f1f5e6: Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev
* commit '
28f1f5e6f9a9f4a8a5e82fcb58c8dfadca7b5f93':
Get basic keyguard working in new branch
Fabrice Di Meglio [Fri, 26 Oct 2012 22:24:12 +0000 (15:24 -0700)]
am
3f8794df: am
59420ecd: Merge "Fix bug #
7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
* commit '
3f8794dfda9dd025a419ad19225bd4f227b297d3':
Kenny Root [Fri, 26 Oct 2012 22:24:08 +0000 (15:24 -0700)]
am
a063bc51: am
9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
* commit '
a063bc51cafc604436c1a2ad8b92de9908165f2e':
Eric Laurent [Fri, 26 Oct 2012 22:24:04 +0000 (15:24 -0700)]
am
49418d7c: am
7e1664d4: Merge "New camera sounds" into jb-mr1-dev
* commit '
49418d7c435954239cedd6a0f594b4cba1525b38':
Svetoslav Ganov [Fri, 26 Oct 2012 22:24:00 +0000 (15:24 -0700)]
am
9fcdd729: am
9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
* commit '
9fcdd7293d428bf543526024d141373e9d5f06ee':
Christopher Tate [Fri, 26 Oct 2012 22:23:57 +0000 (15:23 -0700)]
am
3e96d3d1: am
935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
* commit '
3e96d3d1f9e04e155f79b2e8729f48cb21d1da3d':
Adam Cohen [Fri, 26 Oct 2012 22:23:53 +0000 (15:23 -0700)]
am
c7eebe91: am
6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev
* commit '
c7eebe91ee107e40e9df8338c728d39e9db37ae8':
Irfan Sheriff [Fri, 26 Oct 2012 22:23:49 +0000 (15:23 -0700)]
Fabrice Di Meglio [Fri, 26 Oct 2012 22:23:43 +0000 (15:23 -0700)]
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 '
68a9e6d2227f87689c5b7a113785dda06bcfd475':
Jeff Sharkey [Fri, 26 Oct 2012 22:23:39 +0000 (15:23 -0700)]
am
17671ff0: am
ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
* commit '
17671ff0440159e3e529ff12c0f6b445e0d84302':
John Spurlock [Fri, 26 Oct 2012 22:23:35 +0000 (15:23 -0700)]
am
fd88c257: am
8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
* commit '
fd88c25725948f0302e0fcd642ce1bbd233acc46':
Romain Guy [Fri, 26 Oct 2012 22:23:31 +0000 (15:23 -0700)]
am
ede74090: am
8b946c05: Merge "Defer layer rendering to avoid stalls Bug #
7326824" into jb-mr1-dev
* commit '
ede7409015a35c99b429d1b3d98bef5b56a154bd':
Craig Mautner [Fri, 26 Oct 2012 22:23:27 +0000 (15:23 -0700)]
am
561253f0: am
0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
* commit '
561253f04ddf96071826706820f3b105fb914512':
Michael Jurka [Fri, 26 Oct 2012 22:23:23 +0000 (15:23 -0700)]
am
54030065: am
e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
* commit '
540300654b94c45adc95c4b02b13fbdbea5bb777':
Michael Jurka [Fri, 26 Oct 2012 22:23:20 +0000 (15:23 -0700)]
am
2275482b: am
80343f64: Fix recents animations for secondary users
* commit '
2275482ba63324d390a3adf20d418fc33c1f0272':
Geremy Condra [Fri, 26 Oct 2012 22:23:16 +0000 (15:23 -0700)]
am
b81cedad: am
a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
* commit '
b81cedad5eb152f52cf7659dd8b710ac522a93f4':
Jeff Brown [Fri, 26 Oct 2012 22:23:12 +0000 (15:23 -0700)]
am
c4070bbd: am
1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
* commit '
c4070bbd225198dfd8ba1c71110d96d2c22c5a57':
Jeff Sharkey [Fri, 26 Oct 2012 22:23:08 +0000 (15:23 -0700)]
am
9254d310: am
5831159b: Merge "More migration to Global settings." into jb-mr1-dev
* commit '
9254d3108d1e2860a02448ea93e22dc066b99e3f':
Jeff Brown [Fri, 26 Oct 2012 22:23:04 +0000 (15:23 -0700)]
am
c6275f58: am
ce78b026: Merge "Fix deadlock." into jb-mr1-dev
* commit '
c6275f58ac7478850d2360ae4e1b9e98d8ae47d0':
Dave Burke [Fri, 26 Oct 2012 22:23:00 +0000 (15:23 -0700)]
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 '
2a808f971f3d6d9791185d3eb986cb69b69da0e1':
Xavier Ducrohet [Fri, 26 Oct 2012 22:22:56 +0000 (15:22 -0700)]
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 '
8855ba623245a67be5becaf8f93e5abef35555e8':
Fabrice Di Meglio [Fri, 26 Oct 2012 22:22:42 +0000 (15:22 -0700)]
am
afb856f2: am
45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
* commit '
afb856f2aa7590a191cb676acbee4141ddd21d6b':
Fabrice Di Meglio [Fri, 26 Oct 2012 22:22:37 +0000 (15:22 -0700)]
am
7fb1aac6: am
0437302f: Merge "Fix the build" into jb-mr1-dev
* commit '
7fb1aac6b82c16a2417be2af019f211df85b1555':
Xavier Ducrohet [Fri, 26 Oct 2012 22:22:33 +0000 (15:22 -0700)]
am
ac7806b9: am
d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
* commit '
ac7806b9a78ed66c9a8fa23b6637c836925ebfe7':
Fabrice Di Meglio [Fri, 26 Oct 2012 22:22:29 +0000 (15:22 -0700)]
am
78c66c99: am
07f85fec: Merge "Fix bug #
7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
* commit '
78c66c993fb615fc8448cb0251ab21156074e33c':
Svetoslav Ganov [Fri, 26 Oct 2012 22:22:26 +0000 (15:22 -0700)]
am
34130c86: am
80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
* commit '
34130c86e53c684ed013255d22db64f0d297a994':
Craig Mautner [Fri, 26 Oct 2012 22:22:22 +0000 (15:22 -0700)]
am
b05e449b: am
be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
* commit '
b05e449b083f1ccae52bc35c56afcd5fd7546629':
Irfan Sheriff [Fri, 26 Oct 2012 22:22:18 +0000 (15:22 -0700)]
am
d895caf7: am
b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev
* commit '
d895caf7712f1dd87606cd95ffac9f94e6a757de':
Chet Haase [Fri, 26 Oct 2012 22:22:14 +0000 (15:22 -0700)]
am
e114fcc7: am
58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
* commit '
e114fcc763c584173592cbf723f1109b2cd6b783':
Jeff Hamilton [Fri, 26 Oct 2012 22:22:10 +0000 (15:22 -0700)]
am
d76ba621: am
e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
* commit '
d76ba62101ed3650a4e2edc640f8f311045eb82f':
Scott Main [Fri, 26 Oct 2012 22:22:06 +0000 (15:22 -0700)]
Xavier Ducrohet [Fri, 26 Oct 2012 22:22:02 +0000 (15:22 -0700)]
am
e8c9ce73: am
5e42147a: (-s ours) am
64b3de29: (-s ours) am
434cd38f: Update layoutlib for jb mr1. do not merge.
* commit '
e8c9ce73e3191949f4d05409a6c7aa7fc515c64d':
OSDN Git Service
