OSDN Git Service
Xavier Ducrohet [Mon, 6 Feb 2012 19:42:50 +0000 (11:42 -0800)]
am
c205a9d6: am
f8aea993: Make aapt ignore tools-related data.
* commit '
c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:04 +0000 (11:41 -0800)]
am
f8aea993: Make aapt ignore tools-related data.
* commit '
f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
Scott Main [Wed, 1 Feb 2012 23:56:56 +0000 (15:56 -0800)]
am
2adfc9de: am
633de7ba: docs: fix meta description tag for homepage
* commit '
2adfc9de0390962701535d0c075c4fb8e886d9d8':
Scott Main [Wed, 1 Feb 2012 23:56:55 +0000 (15:56 -0800)]
Scott Main [Wed, 1 Feb 2012 23:15:10 +0000 (15:15 -0800)]
am
be09298e: am
633de7ba: docs: fix meta description tag for homepage
* commit '
be09298eb708f6acb6af7028fbca28afdf230008':
docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:12:40 +0000 (15:12 -0800)]
am
633de7ba: docs: fix meta description tag for homepage
* commit '
633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:12:33 +0000 (15:12 -0800)]
am
633de7ba: docs: fix meta description tag for homepage
* commit '
633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:03:15 +0000 (15:03 -0800)]
am
fb16fdf2: am
6aaa27fb: docs: fix broken link
* commit '
fb16fdf2d11b807e9c5d986e6135c2915f1f6523':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 23:00:49 +0000 (15:00 -0800)]
am
6aaa27fb: docs: fix broken link
* commit '
6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 23:00:30 +0000 (15:00 -0800)]
am
6aaa27fb: docs: fix broken link
* commit '
6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 21:54:48 +0000 (13:54 -0800)]
am
b49c0355: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
b49c0355aa6cb7411f6f5061f5fd31ee5cdea14d':
Scott Main [Wed, 1 Feb 2012 21:54:45 +0000 (13:54 -0800)]
am
e043db89: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
e043db892436f643fc2d71df3bc4b2604c556988':
Scott Main [Wed, 1 Feb 2012 21:54:43 +0000 (13:54 -0800)]
am
13f3c854: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
13f3c854d8fb635fa824a1ba15fe85152fed131e':
Xia Wang [Wed, 1 Feb 2012 21:54:40 +0000 (13:54 -0800)]
am
581a3334: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
581a33344485181eb3484ba7bf50ff2b52be6d99':
Scott Main [Wed, 1 Feb 2012 21:52:21 +0000 (13:52 -0800)]
am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 21:52:19 +0000 (13:52 -0800)]
am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 21:52:17 +0000 (13:52 -0800)]
am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
Xia Wang [Wed, 1 Feb 2012 21:52:13 +0000 (13:52 -0800)]
am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
Scott Main [Wed, 1 Feb 2012 19:58:57 +0000 (11:58 -0800)]
am
8f6b4c52: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
8f6b4c52ded03527d3c60e99cafa66aaabb4f355':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 19:56:23 +0000 (11:56 -0800)]
am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 19:54:57 +0000 (11:54 -0800)]
Merge "docs: fix action bar style example" into ics-mr1
Scott Main [Wed, 1 Feb 2012 19:48:28 +0000 (11:48 -0800)]
am
b43a0f1f: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
b43a0f1fe5cddf1376c52d0ace2d958f21e4044d':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:48:26 +0000 (11:48 -0800)]
am
9af875ec: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
9af875ec74e34541539897d7a8069b4ea7f07b12':
docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:45:51 +0000 (11:45 -0800)]
am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:45:49 +0000 (11:45 -0800)]
am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:43:48 +0000 (11:43 -0800)]
Merge "docs: dashboard update for feb 1" into ics-mr1
Xia Wang [Wed, 1 Feb 2012 18:57:07 +0000 (10:57 -0800)]
am
e546b879: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
e546b879a5aa9c58a58fc1c5a2e3eb0123d4d5b2':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:54:30 +0000 (10:54 -0800)]
am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:51:43 +0000 (10:51 -0800)]
Merge "Fix a typo in image processing test" into ics-mr1
The Android Open Source Project [Wed, 1 Feb 2012 18:01:22 +0000 (10:01 -0800)]
am
3f3afbef: Reconcile with ics-mr1-release
* commit '
3f3afbef0fc7c4199bb7d992dc52efaa6db1b91a':
The Android Open Source Project [Wed, 1 Feb 2012 16:49:49 +0000 (08:49 -0800)]
Reconcile with ics-mr1-release
Change-Id: I79900da9bc339bad1350124768b53026f465a345
The Android Open Source Project [Wed, 1 Feb 2012 16:42:59 +0000 (08:42 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f
Scott Main [Wed, 1 Feb 2012 00:10:38 +0000 (16:10 -0800)]
am
0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a form
* commit '
0b2701b7344fb7b7b6f9a1c1c99c8ede81b49d2d':
docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.
Scott Main [Wed, 1 Feb 2012 00:08:09 +0000 (16:08 -0800)]
Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug." into ics-mr1
The Android Automerger [Tue, 31 Jan 2012 23:42:17 +0000 (15:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Tue, 31 Jan 2012 22:02:44 +0000 (14:02 -0800)]
am
792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
* commit '
792d83c5087a7a6dec4e64f59f5b78d1041c9585':
Use LTE SNR and RSRP to set signal level bar.
Justin Ho [Tue, 31 Jan 2012 22:00:55 +0000 (14:00 -0800)]
Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:41:03 +0000 (08:41 -0800)]
am
34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
* commit '
34260ad79ede2ed35cc9859095b778f194b9650b':
docs: fix locale name; South Africa is local en_ZA external issue 23133
Scott Main [Tue, 31 Jan 2012 16:41:01 +0000 (08:41 -0800)]
am
8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
* commit '
8bfeb10f98125706d8bb7afa1067ca563e741540':
docs: fix typo in market doc external issue 22650
Scott Main [Tue, 31 Jan 2012 16:40:59 +0000 (08:40 -0800)]
am
4b2eb9a5: Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1
* commit '
4b2eb9a50bbead0b756944ebffd01c89916896ad':
docs: fix typos and clarify some grammar in summary external issue 21548
Scott Main [Tue, 31 Jan 2012 16:39:36 +0000 (08:39 -0800)]
Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:39:03 +0000 (08:39 -0800)]
Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:38:49 +0000 (08:38 -0800)]
am
b86cba15: docs: fix typo in eclipse doc external issue 21475
* commit '
b86cba156c78740793d94444e01d17ef21cb53cc':
docs: fix typo in eclipse doc external issue 21475
Scott Main [Tue, 31 Jan 2012 16:37:59 +0000 (08:37 -0800)]
Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1
The Android Automerger [Tue, 31 Jan 2012 07:33:37 +0000 (23:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Tue, 31 Jan 2012 00:15:29 +0000 (16:15 -0800)]
am
b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
* commit '
b2d37b39a1bb48d9f9c5b45255c5df769b85d6ae':
docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
Scott Main [Tue, 31 Jan 2012 00:13:28 +0000 (16:13 -0800)]
Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
Scott Main [Mon, 30 Jan 2012 23:14:53 +0000 (15:14 -0800)]
am
6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '
6507df8b78d80403d66d321748ad47290a611e3f':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
The Android Open Source Project [Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
The Android Automerger [Mon, 30 Jan 2012 21:23:32 +0000 (13:23 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Mon, 30 Jan 2012 20:54:02 +0000 (12:54 -0800)]
am
e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '
e22f4748565915948c8af2961ac74fe81a417e3b':
Update documentation to reflect the old approach not working.
Dianne Hackborn [Mon, 30 Jan 2012 20:52:11 +0000 (12:52 -0800)]
Merge "Update documentation to reflect the old approach not working." into ics-mr1
John Wang [Mon, 30 Jan 2012 19:23:24 +0000 (11:23 -0800)]
am
b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
* commit '
b069833e63f711a6b140385003d67b3ff68fe66b':
Adjust the LTE signal bar mapping.
John Wang [Mon, 30 Jan 2012 19:20:35 +0000 (11:20 -0800)]
Merge "Adjust the LTE signal bar mapping." into ics-mr1
Scott Main [Mon, 30 Jan 2012 18:05:59 +0000 (10:05 -0800)]
am
73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
* commit '
73790a53b580b8ec8eff88e25a19b5fcfa33392a':
docs: add G+ page announcement to homepage
Scott Main [Mon, 30 Jan 2012 18:03:21 +0000 (10:03 -0800)]
Merge "docs: add G+ page announcement to homepage" into ics-mr1
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:58:03 +0000 (13:58 -0800)]
am
dc8668c8: am
97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '
dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
Wi-Fi: Handle disconnect in middle of DHCP operation
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:55:56 +0000 (13:55 -0800)]
am
97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '
9781870491f4f33403f8d518879a88c20180d7cb':
Wi-Fi: Handle disconnect in middle of DHCP operation
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:36:48 +0000 (13:36 -0800)]
Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
The Android Automerger [Fri, 27 Jan 2012 02:32:07 +0000 (18:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Roman Nurik [Fri, 27 Jan 2012 00:35:06 +0000 (16:35 -0800)]
am
639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '
639b25ea289481da6cfd4229649b51ffc6ce3406':
docs: add NOTICE to action bar icon pack and sprinkle download links
Roman Nurik [Fri, 27 Jan 2012 00:32:56 +0000 (16:32 -0800)]
Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
Roman Nurik [Thu, 26 Jan 2012 23:35:46 +0000 (15:35 -0800)]
am
00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '
00b3ceb48b5e23daa8101db6080bee46d6518f43':
docs: Update designing-navigation training class to link to Android Design
Roman Nurik [Thu, 26 Jan 2012 23:33:57 +0000 (15:33 -0800)]
Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
Daniel Sandler [Thu, 26 Jan 2012 21:04:17 +0000 (13:04 -0800)]
am
5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '
5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
Suppress mobile-out-of-service label if wifi connected.
Daniel Sandler [Thu, 26 Jan 2012 21:02:32 +0000 (13:02 -0800)]
Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
Scott Main [Thu, 26 Jan 2012 19:44:58 +0000 (11:44 -0800)]
am
6c055bbd: docs: add action bar icons ZIP
* commit '
6c055bbdf475e6cd324912326c802244b9a76c3b':
docs: add action bar icons ZIP
Scott Main [Thu, 26 Jan 2012 02:00:42 +0000 (18:00 -0800)]
am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
9ac4dd828065410efbb380992d996c7e93daf437':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 01:58:54 +0000 (17:58 -0800)]
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:52:08 +0000 (17:52 -0800)]
am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
f466db14ec32fbaf08a868df40f7685a7e7df3db':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:50:20 +0000 (17:50 -0800)]
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
Joe Malin [Thu, 26 Jan 2012 01:30:13 +0000 (17:30 -0800)]
am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:27:46 +0000 (17:27 -0800)]
am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
DOC CHANGE: New Content Provider topics
The Android Automerger [Wed, 25 Jan 2012 20:08:57 +0000 (12:08 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Greenwalt [Wed, 25 Jan 2012 19:30:39 +0000 (11:30 -0800)]
am
44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '
44f64c965776ae65ff85ef8c37afb7e14483bdf2':
Filter our v6 address from tethering dns.
Robert Greenwalt [Wed, 25 Jan 2012 19:28:30 +0000 (11:28 -0800)]
Merge "Filter our v6 address from tethering dns." into ics-mr1
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:30:31 +0000 (10:30 -0800)]
am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:27:41 +0000 (10:27 -0800)]
am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 17:17:45 +0000 (09:17 -0800)]
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
Roman Nurik [Wed, 25 Jan 2012 02:11:12 +0000 (18:11 -0800)]
am
cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
* commit '
cf077fdd79853dd4778598a623dc2f469c1a8934':
docs: Android Design typo and grammar fixes
Roman Nurik [Wed, 25 Jan 2012 02:08:52 +0000 (18:08 -0800)]
Merge "docs: Android Design typo and grammar fixes" into ics-mr1
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:15:36 +0000 (15:15 -0800)]
am
4cd2b343: am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
4cd2b343272429adae1fc68e0ec0628c69e88e6d':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:15:33 +0000 (15:15 -0800)]
am
fc2ea24b: am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
fc2ea24b024f7a015d67054adb7bb09ff3a0a97b':
stagefright aacenc: Add missing newlines at the end of files
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:13:45 +0000 (15:13 -0800)]
am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
98539a4eba7677c0b1ddc12f800c7075851ef302':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:13:42 +0000 (15:13 -0800)]
am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
d80cbb8c7b13203704c00e2f5941588811c15665':
stagefright aacenc: Add missing newlines at the end of files
Jean-Baptiste Queru [Tue, 24 Jan 2012 22:26:30 +0000 (14:26 -0800)]
Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
The Android Automerger [Tue, 24 Jan 2012 21:33:01 +0000 (13:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Daniel Sandler [Tue, 24 Jan 2012 20:57:14 +0000 (12:57 -0800)]
am
185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '
185c0ef7e4aaa4bb978a6eb5c93c569585a07f56':
Stop showing "No internet connection" when there is one.
Daniel Sandler [Tue, 24 Jan 2012 20:54:48 +0000 (12:54 -0800)]
Merge "Stop showing "No internet connection" when there is one." into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:51:50 +0000 (11:51 -0800)]
am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Tue, 24 Jan 2012 19:51:47 +0000 (11:51 -0800)]
am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Eric Laurent [Tue, 24 Jan 2012 19:49:39 +0000 (11:49 -0800)]
Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:49:16 +0000 (11:49 -0800)]
Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
Robert Greenwalt [Tue, 24 Jan 2012 19:42:21 +0000 (11:42 -0800)]
am
f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
* commit '
f449ea9e96162698f4ec6d62c70750eb50744da7':
Use the carrier-given dns addrs for tethering.
Robert Greenwalt [Tue, 24 Jan 2012 19:40:19 +0000 (11:40 -0800)]
Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:37:02 +0000 (11:37 -0800)]
am
47163685: Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
Another attempt at issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Tue, 24 Jan 2012 19:34:49 +0000 (11:34 -0800)]
am
c986d6f0: Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit '
c986d6f01b00dd760ba1650918baadd24a6dc838':
Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode
Daniel Sandler [Tue, 24 Jan 2012 19:34:47 +0000 (11:34 -0800)]
am
a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit '
a4474ae02546d725686f9c08113c16a84aca912c':
Detect and repair invalid layouts in the navigation bar.
Dianne Hackborn [Tue, 24 Jan 2012 19:33:15 +0000 (11:33 -0800)]
Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:33:06 +0000 (11:33 -0800)]
Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
OSDN Git Service
