git.osdn.net Git - android-x86/frameworks-base.git/log

Michael Jurka [Mon, 29 Oct 2012 20:35:20 +0000 (13:35 -0700)]

am e88eebbb: am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev

* commit 'e88eebbb3ba8999cd81e79dc62a8dd14c64b592d':
Adding ability to add multiple widgets to keyguard

commit | commitdiff | tree

Dianne Hackborn [Mon, 29 Oct 2012 20:35:16 +0000 (13:35 -0700)]

am 62778aaa: am db3efba6: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev

* commit '62778aaa0317f0bdfb6901e8e6493161717e9b2a':

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 20:35:13 +0000 (13:35 -0700)]

am 4dc794a7: am 5fbc82ef: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev

* commit '4dc794a779ab6d208e276b88a9a2f12ee5a4034e':

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 20:35:07 +0000 (13:35 -0700)]

am 662bf7b2: am eee20931: Beginnings of bouncer support; add scrims and state tracking

* commit '662bf7b23e74bb7b92c3ace8ddfdeea1a6791961':
Beginnings of bouncer support; add scrims and state tracking

commit | commitdiff | tree

Irfan Sheriff [Mon, 29 Oct 2012 20:35:02 +0000 (13:35 -0700)]

am 446e66ed: am 9253f561: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev

* commit '446e66edd8eb335d23697614102c80fe3fe94655':

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 20:34:56 +0000 (13:34 -0700)]

am 0234e9db: am 2ca85c20: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev

* commit '0234e9db974a05e93f691e2e613117867e59a79d':

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 20:34:52 +0000 (13:34 -0700)]

am 82da5b17: am c0657fb3: Integrate changes from lockscreen proto app

* commit '82da5b173c586ce085a85421ebebdd281508f0ba':
Integrate changes from lockscreen proto app

commit | commitdiff | tree

Romain Guy [Mon, 29 Oct 2012 20:34:49 +0000 (13:34 -0700)]

am b18e19f5: am ee0f615f: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev

* commit 'b18e19f5a018bfd59fdc2b2f0582698c9a6e5994':

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 20:34:45 +0000 (13:34 -0700)]

am 38f7ae14: am f785af4d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '38f7ae14dfff0004675383adde61f051e6483353':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 20:27:46 +0000 (13:27 -0700)]

am 511e3874: am a187b478: (-s ours) am 188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '511e3874ff9759a5ed1612fb21ef38947a3fd71f':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 19:50:08 +0000 (12:50 -0700)]

am 9b083fd8: am 599885d5: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev

* commit '9b083fd87b64725ee5b226f9b3138034360aa49b':

commit | commitdiff | tree

Chris Wren [Mon, 29 Oct 2012 19:50:05 +0000 (12:50 -0700)]

am 0d3215c2: am f0cec427: Merge "remove debug logs." into jb-mr1-lockscreen-dev

* commit '0d3215c24c21b17306e4c3229ecdbc51d8958531':
remove debug logs.

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 19:50:01 +0000 (12:50 -0700)]

am de877ac2: am 405e6746: am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev

* commit 'de877ac28db2455852a36663f1ef74c6c92d4c28':

commit | commitdiff | tree

Adam Cohen [Mon, 29 Oct 2012 19:49:58 +0000 (12:49 -0700)]

am f2344e08: am a9f16669: Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev

* commit 'f2344e087cdd8afafb09f2637de02c50c9b1f972':
Fading side pages as per mock

commit | commitdiff | tree

Chris Wren [Mon, 29 Oct 2012 19:49:54 +0000 (12:49 -0700)]

am a90f82fc: am ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev

* commit 'a90f82fc10590bf70e0308b1bd55cc67fbfe13a9':
catch exceptional cases on factory-fresh devices.

commit | commitdiff | tree

Christopher Tate [Mon, 29 Oct 2012 19:49:47 +0000 (12:49 -0700)]

am d56476e2: am 698e144f: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev

* commit 'd56476e205b380c5a5ab6cce5163780153c7d70c':

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 19:49:43 +0000 (12:49 -0700)]

am ea2078e8: am 985dc142: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'ea2078e82f7ef274a6c587a3fe55ab35beef43e9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 19:49:39 +0000 (12:49 -0700)]

am b7ac4cbe: am 2171fa1c: am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'b7ac4cbe50197d6c11427599c66b79b3b26cb491':

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 19:49:36 +0000 (12:49 -0700)]

am 9b687f45: am d9fb5848: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev

* commit '9b687f45d0b85a12f269c842a426ba75a1e622e8':

commit | commitdiff | tree

Zhihai Xu [Mon, 29 Oct 2012 19:49:33 +0000 (12:49 -0700)]

am 1bab0435: am 11181c7a: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev

* commit '1bab04356e9f68387c6f916eaf702a626cbff6f2':

commit | commitdiff | tree

Dirk Dougherty [Mon, 29 Oct 2012 19:49:29 +0000 (12:49 -0700)]

am 9b9d4e06: am 7833ea17: am d8d83faa: am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.

* commit '9b9d4e0676411125581d871c281640e20a1435d0':

commit | commitdiff | tree

Dianne Hackborn [Mon, 29 Oct 2012 19:49:26 +0000 (12:49 -0700)]

am 98385f84: am cc9106bb: am ecf4725e: Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev

* commit '98385f8465ba72a0eacb275a75c774770bd84dc9':

commit | commitdiff | tree

Dave Burke [Mon, 29 Oct 2012 19:49:23 +0000 (12:49 -0700)]

am dfe05a5e: am 4d56a167: am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev

* commit 'dfe05a5e11928fa39bfca618041729e8a8cba081':

commit | commitdiff | tree

Eric Laurent [Mon, 29 Oct 2012 19:49:19 +0000 (12:49 -0700)]

am 6b6d896b: am 22df26ca: am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev

* commit '6b6d896b7bba6cacd9ac893f6d68f6450f7e856a':

commit | commitdiff | tree

Kenny Root [Mon, 29 Oct 2012 19:49:16 +0000 (12:49 -0700)]

am c9cc6e5a: am 16106a76: am 92bc9b31: PMS: check outInfo for null during delete

* commit 'c9cc6e5a539f0c88f11351424c09d13963050acd':

commit | commitdiff | tree

Dianne Hackborn [Mon, 29 Oct 2012 19:49:13 +0000 (12:49 -0700)]

am f650447c: am a4dcf311: am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev

* commit 'f650447c0713e8cc0a50dfbdca7b26d170d79fd7':

commit | commitdiff | tree

Svetoslav Ganov [Mon, 29 Oct 2012 19:49:09 +0000 (12:49 -0700)]

am 0223483d: am 40ca868a: am e1655c98: (-s ours) Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev

* commit '0223483d14837140cc0c9797d9336baf1d716ec6':

commit | commitdiff | tree

John Spurlock [Mon, 29 Oct 2012 19:49:05 +0000 (12:49 -0700)]

am 8c480e4b: am 86b6357e: Manual f/b merge of lockhotness camera integration.

* commit '8c480e4b1fbc867135384d357803eeeeeff7bc47':
Manual f/b merge of lockhotness camera integration.

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 19:49:02 +0000 (12:49 -0700)]

am 7e83e339: am 848a5557: Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev

* commit '7e83e339533b2c3a3170a0a9f48449dcc6cc0fbb':
Fix up GlowPadView attributes

commit | commitdiff | tree

Jim Miller [Mon, 29 Oct 2012 19:48:58 +0000 (12:48 -0700)]

am 412b6a5e: am 19a52670: Merge latest prototype changes into keyguard

* commit '412b6a5ef27280fb2c83b29a2ef830ebd9b4cf41':
Merge latest prototype changes into keyguard

commit | commitdiff | tree

Kenny Root [Mon, 29 Oct 2012 19:48:55 +0000 (12:48 -0700)]

am f834fb33: am 356f2f59: am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev

* commit 'f834fb33dccfc6cda7d0c7f4f47242cb026bef34':

commit | commitdiff | tree

Craig Mautner [Mon, 29 Oct 2012 19:48:51 +0000 (12:48 -0700)]

am ae2a3c77: am ce1696c2: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev

* commit 'ae2a3c776be876588ca074417027c5a68e08d1bf':

commit | commitdiff | tree

Hiroshi Lockheimer [Mon, 29 Oct 2012 19:48:48 +0000 (12:48 -0700)]

am 50920f5f: am 5c731480: am c63aa962: Merge "Fix NPE." into jb-mr1-dev

* commit '50920f5f5866fb6952fa319d730868add263b31e':

commit | commitdiff | tree

Chet Haase [Mon, 29 Oct 2012 19:48:44 +0000 (12:48 -0700)]

am cc0696e5: am 4a4ae0b7: am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev

* commit 'cc0696e527b6dfccdd1d8b4a3564bce1cae50979':

commit | commitdiff | tree

Romain Guy [Mon, 29 Oct 2012 19:48:41 +0000 (12:48 -0700)]

am 773f299f: am aae03bb4: am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev

* commit '773f299f2cc4df1ce3825765969c3d9df2309461':

commit | commitdiff | tree

Danielle Millett [Mon, 29 Oct 2012 19:48:37 +0000 (12:48 -0700)]

am 5cba537a: am 7c420ec6: Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev

* commit '5cba537ae14ab693392a2f018a744d55156ed97f':
Handling popups correctly for face unlock

commit | commitdiff | tree

Jamie Gennis [Mon, 29 Oct 2012 19:48:34 +0000 (12:48 -0700)]

am 1a5ddfdf: am 0e259dcc: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

* commit '1a5ddfdfd4b833bebb39d9c708290264c698f412':

commit | commitdiff | tree

Andy McFadden [Mon, 29 Oct 2012 19:48:30 +0000 (12:48 -0700)]

am c3fdaab2: am 2eb8303b: am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev

* commit 'c3fdaab20b9da5ac0f5f4d1774d24f6c9e01a61e':

commit | commitdiff | tree

Michael Jurka [Mon, 29 Oct 2012 19:48:27 +0000 (12:48 -0700)]

am d73f0b1f: am cd57bdb5: am a665df57: Merge "Use lighter background for Recents" into jb-mr1-dev

* commit 'd73f0b1fe93aec69b0e4f732b213861111dd1588':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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.

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Hiroshi Lockheimer [Mon, 29 Oct 2012 19:44:58 +0000 (12:44 -0700)]

am 5c731480: am c63aa962: Merge "Fix NPE." into jb-mr1-dev

* commit '5c731480ca3dec47362023076bc827e535da979d':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Jason Simmons [Mon, 29 Oct 2012 19:23:45 +0000 (12:23 -0700)]

am df304ba0: resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev

* commit 'df304ba0babc04025c3b39c079a64aed8d1a6e07':
Integrate new PIN pad.

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 16:28:27 +0000 (09:28 -0700)]

am 46ea0544: am f33ff923: am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev

* commit '46ea05449516bfe8c4b90e4d89f92cce5286baaa':

commit | commitdiff | tree

Chris Wren [Mon, 29 Oct 2012 16:28:18 +0000 (09:28 -0700)]

am 0882fe87: am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev

* commit '0882fe87d4e104796ffa4dad94e07ec8abc69685':
merge new multiuser avatars in from proto app

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 16:28:11 +0000 (09:28 -0700)]

am 52b5f97d: am 1afe7788: am 8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '52b5f97ddb06b1863ec9ec78a390c5ec699d152d':

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 16:28:08 +0000 (09:28 -0700)]

am 3adefe73: am 22f91da2: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '3adefe7338df5a7c995540f4094c9f8c30db9a2e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Romain Guy [Mon, 29 Oct 2012 16:28:04 +0000 (09:28 -0700)]

am 9808258f: am 0472d565: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev

* commit '9808258f46badbe1e30e67ff66b2c0f1234ca966':

commit | commitdiff | tree

Irfan Sheriff [Mon, 29 Oct 2012 16:28:01 +0000 (09:28 -0700)]

am bc685c49: am 086dc1ce: am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev

* commit 'bc685c49db5a6cf0065c63139ef64fa8ddc1205c':

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 16:27:57 +0000 (09:27 -0700)]

am f501a9cd: am bd28f237: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'f501a9cde8db8165ddbc8cf134b23b1d5353e470':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 16:24:18 +0000 (09:24 -0700)]

am 379c47ec: am 66e893fb: (-s ours) am 21ce854b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '379c47ec9fd4de367518b36c5ee366c60e52a48a':

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 16:22:38 +0000 (09:22 -0700)]

am 8fe9a197: am 79db4800: am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev

* commit '8fe9a197b2ea1e364bec25a4a4bd0a04437fbfb1':

commit | commitdiff | tree

Justin Ho [Mon, 29 Oct 2012 16:22:35 +0000 (09:22 -0700)]

am d8b4f070: am c1c03c42: am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev

* commit 'd8b4f07006397304efcec3172b865bf5997855f2':

commit | commitdiff | tree

Irfan Sheriff [Mon, 29 Oct 2012 16:22:32 +0000 (09:22 -0700)]

am f4f66363: am 5f8e3f2b: am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev

* commit 'f4f66363132f05b61bc5cf3f8818a5c36f9dcddc':

commit | commitdiff | tree

Jeff Sharkey [Mon, 29 Oct 2012 16:22:28 +0000 (09:22 -0700)]

am af8974dd: am 32a1c5f7: am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev

* commit 'af8974ddeeb44ffeb6bc4fb731c22b80c2160525':

commit | commitdiff | tree

Daniel Sandler [Mon, 29 Oct 2012 16:22:22 +0000 (09:22 -0700)]

am 7fa5c737: am cf64067c: am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev

* commit '7fa5c737ccdb966c9e2f5f07b5b0f0d5982f6e6e':