OSDN Git Service
Robert Ly [Mon, 29 Oct 2012 20:31:23 +0000 (13:31 -0700)]
am
6a8d6da9: am
148d4131: am
5b45e337: am
d6bbf71d: am
ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '
6a8d6da9bb8829011bcc249e308461ea64e431e1':
Jim Miller [Mon, 29 Oct 2012 20:31:19 +0000 (13:31 -0700)]
am
f90716c9: Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev
* commit '
f90716c9cc9f5ebed9d6bbdae40295490d94890f':
Route signals from SlidingChalleng to SecurityView
John Spurlock [Mon, 29 Oct 2012 20:31:15 +0000 (13:31 -0700)]
am
7de482ba: am
5c87f533: Merge "Revert part of fix for b/
7377776 to fix b/
7411356." into jb-mr1-dev
* commit '
7de482babc55f1034d37552a0b254427694b3584':
Adam Powell [Mon, 29 Oct 2012 20:31:12 +0000 (13:31 -0700)]
am
0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops
* commit '
0b1b552268bc6641cc5d01fb80c12258da9c6985':
Keyguard bouncer notifications; focus moving and the bouncer; slops
Chet Haase [Mon, 29 Oct 2012 20:31:08 +0000 (13:31 -0700)]
am
b3975088: am
9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
* commit '
b3975088b6f10d45ed5589f10887a4bc12fe942c':
Daniel Sandler [Mon, 29 Oct 2012 20:31:04 +0000 (13:31 -0700)]
am
d85a960b: Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev
* commit '
d85a960b14203f63c7e2b8b16235b60ea1023151':
Fix Google Now on lockscreen.
Fabrice Di Meglio [Mon, 29 Oct 2012 20:31:01 +0000 (13:31 -0700)]
am
654761a0: am
3e297339: Merge "FIx bug #
7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
* commit '
654761a059f85ced7316e4027a93ba18b5071e0f':
John Spurlock [Mon, 29 Oct 2012 20:30:56 +0000 (13:30 -0700)]
am
2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
* commit '
2e8a98e269486700d985f842806ce70e3a394dc9':
Manual frameworks/base merge from lockhotness (camera).
Svetoslav Ganov [Mon, 29 Oct 2012 20:30:53 +0000 (13:30 -0700)]
am
e3b51ef0: am
324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
* commit '
e3b51ef0022187aeb0e39f332a3c693dcfcdf625':
Daniel Sandler [Mon, 29 Oct 2012 20:30:48 +0000 (13:30 -0700)]
am
c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
* commit '
c57f0d3e540f916f629d160148231bb38d3deb64':
Haptics for PIN enter key
Daniel Sandler [Mon, 29 Oct 2012 20:30:45 +0000 (13:30 -0700)]
am
40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
* commit '
40d98edb43e3e897b1db4ac9f47bb522f585d3a5':
Haptics for PIN keys.
Bryan Mawhinney [Mon, 29 Oct 2012 20:30:41 +0000 (13:30 -0700)]
am
661c2e74: am
33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
* commit '
661c2e7495955f063ce0108ec2d76164fd75bec5':
Daniel Sandler [Mon, 29 Oct 2012 20:30:36 +0000 (13:30 -0700)]
am
d5692742: PIN pad cosmetics.
* commit '
d5692742c1ff056e9fe55a495632229c86ed5384':
PIN pad cosmetics.
Daniel Sandler [Mon, 29 Oct 2012 20:30:32 +0000 (13:30 -0700)]
am
2c1ce056: Cleaning up password input.
* commit '
2c1ce0564fbd329e9e9ccfca100c69cfc1fd2645':
Cleaning up password input.
Daniel Sandler [Mon, 29 Oct 2012 20:30:28 +0000 (13:30 -0700)]
am
51d39f2d: Add ECA to PIN view
* commit '
51d39f2df9ed787644290fbff49b3a8282444c9a':
Add ECA to PIN view
Jim Miller [Mon, 29 Oct 2012 20:30:24 +0000 (13:30 -0700)]
am
df99b1d5: Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev
* commit '
df99b1d5d34c69f1a2e4490dadae5e69a0dd5a72':
Fix new password view in keyguard
Michael Jurka [Mon, 29 Oct 2012 20:30:20 +0000 (13:30 -0700)]
Michael Jurka [Mon, 29 Oct 2012 20:30:16 +0000 (13:30 -0700)]
am
147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
* commit '
147dfc8642ecbdce527d18bdbeece7b7d05dc883':
Adding ability to add multiple widgets to keyguard
Dianne Hackborn [Mon, 29 Oct 2012 20:30:09 +0000 (13:30 -0700)]
am
db3efba6: am
ead7d90e: Merge "Fix issue #
7408647: Add getUserCount() API" into jb-mr1-dev
* commit '
db3efba6fc3a71cfd0a6406704970f1bcb13242f':
Daniel Sandler [Mon, 29 Oct 2012 20:30:04 +0000 (13:30 -0700)]
am
5fbc82ef: am
38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* commit '
5fbc82ef79277d14444549098147ecea69caf6a6':
Adam Powell [Mon, 29 Oct 2012 20:30:00 +0000 (13:30 -0700)]
am
eee20931: Beginnings of bouncer support; add scrims and state tracking
* commit '
eee209313d564be37b8fc068f785b3844cd6597e':
Beginnings of bouncer support; add scrims and state tracking
Irfan Sheriff [Mon, 29 Oct 2012 20:29:57 +0000 (13:29 -0700)]
am
9253f561: am
4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit '
9253f56163a7b88a09bc4347ba6fe631dd7a08d8':
Jeff Brown [Mon, 29 Oct 2012 20:29:47 +0000 (13:29 -0700)]
am
2ca85c20: am
900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit '
2ca85c20517037a86fd59eba7946267dd49b4c61':
Adam Powell [Mon, 29 Oct 2012 20:29:43 +0000 (13:29 -0700)]
am
c0657fb3: Integrate changes from lockscreen proto app
* commit '
c0657fb36ce5ede652e8af084e484d07abfb449d':
Integrate changes from lockscreen proto app
Romain Guy [Mon, 29 Oct 2012 20:29:40 +0000 (13:29 -0700)]
am
ee0f615f: am
99333315: Merge "Ensure we have a GL context before deleting View layers Bug #
7391098" into jb-mr1-dev
* commit '
ee0f615ffdbb790a6bb64b0efe444b4c7f8fe291':
Baligh Uddin [Mon, 29 Oct 2012 20:29:36 +0000 (13:29 -0700)]
am
f785af4d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
f785af4d2ed49b8bf947df28d77b6c9b7cf1611d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 20:25:43 +0000 (13:25 -0700)]
am
a187b478: (-s ours) am
188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
a187b478b6d19daa39c2879c434fea7fba463c0d':
Amith Yamasani [Mon, 29 Oct 2012 19:46:28 +0000 (12:46 -0700)]
am
599885d5: am
cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
* commit '
599885d5308992b2554993903b717c5f0eb5b6a8':
Chris Wren [Mon, 29 Oct 2012 19:46:24 +0000 (12:46 -0700)]
am
f0cec427: Merge "remove debug logs." into jb-mr1-lockscreen-dev
* commit '
f0cec427a4f73bda130eda98c2a7f70e44ff587b':
remove debug logs.
Victoria Lease [Mon, 29 Oct 2012 19:46:20 +0000 (12:46 -0700)]
am
405e6746: am
f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
* commit '
405e6746c671a41742581fa1313ca6d52f3484c7':
Adam Cohen [Mon, 29 Oct 2012 19:46:16 +0000 (12:46 -0700)]
am
a9f16669: Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev
* commit '
a9f166695b92e91ea6bb13a41f3aa1fb3f6ee77c':
Fading side pages as per mock
Chris Wren [Mon, 29 Oct 2012 19:46:13 +0000 (12:46 -0700)]
am
ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev
* commit '
ff8722574ee335453845c3dc04435a20dc94a99b':
catch exceptional cases on factory-fresh devices.
Christopher Tate [Mon, 29 Oct 2012 19:46:09 +0000 (12:46 -0700)]
am
698e144f: am
acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev
* commit '
698e144f70ff1482452922f159789c2f24a5162c':
Baligh Uddin [Mon, 29 Oct 2012 19:46:05 +0000 (12:46 -0700)]
am
985dc142: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
985dc142642c43e54c15a436027a11d9b61ab3d8':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 19:46:00 +0000 (12:46 -0700)]
am
2171fa1c: am
0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2171fa1cd3be23fba4d3be077ff0cd6521762107':
Jeff Brown [Mon, 29 Oct 2012 19:45:56 +0000 (12:45 -0700)]
am
d9fb5848: am
1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
* commit '
d9fb5848c8f049b1b2e08b415e40e08de814c5e5':
Zhihai Xu [Mon, 29 Oct 2012 19:45:52 +0000 (12:45 -0700)]
am
11181c7a: am
8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
* commit '
11181c7ae6a9f8278fbf99676b3476173b18b098':
Dirk Dougherty [Mon, 29 Oct 2012 19:45:49 +0000 (12:45 -0700)]
am
7833ea17: am
d8d83faa: am
cde979d2: am
3d087920: am
76cdbdc8: Doc change: update develop landing page content.
* commit '
7833ea17ad32fcb012b27c32b3be946e86f35e19':
Dianne Hackborn [Mon, 29 Oct 2012 19:45:45 +0000 (12:45 -0700)]
am
cc9106bb: am
ecf4725e: Merge "Fix issue #
7401818: Wrong transition animation when clearing task" into jb-mr1-dev
* commit '
cc9106bb7ae91affb4c5cd489a29f1971eca5974':
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
OSDN Git Service
