Vasu Nori
b4e1221611
am 7489a470: am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
...
* commit '7489a4709daf39aff61a17818de282d9ca4dc7c8':
bug:3396894 (HC branch) remove STOPSHIP code
2011-01-26 23:47:22 -08:00
Vasu Nori
895f6e2c32
am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
...
* commit 'd529d0df8f2e93e0dc74887ab43eff46e07cef2e':
bug:3396894 (HC branch) remove STOPSHIP code
2011-01-26 23:45:27 -08:00
Vasu Nori
e1b06e72a7
Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
2011-01-26 23:43:17 -08:00
Svetoslav Ganov
21a1750e34
am a7477f6b: am c291a7bf: Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
...
* commit 'a7477f6b1c2222bc2cc71416cad108adc0b6f0a3':
The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week.
2011-01-26 23:03:01 -08:00
Svetoslav Ganov
371744de71
am c291a7bf: Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
...
* commit 'c291a7bf7a163cea10be135279103f72a6418383':
The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week.
2011-01-26 23:01:03 -08:00
Svetoslav Ganov
0f0eac818f
Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
2011-01-26 22:59:23 -08:00
Basavapatna Dattaguru
ac2e3007d9
am 90982936: am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
...
* commit '90982936a026f1f951fe06ad4d2bcfd72a99ab8f':
Revert "Video editor CTS: Framework modifications"
2011-01-26 22:54:41 -08:00
Basavapatna Dattaguru
e095e5351f
am 141a2adb: am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
...
* commit '141a2adb25130bcbe8620ae239e94d33c7c92eef':
Revert "Fixes Issue ID: 3396697"
2011-01-26 22:54:37 -08:00
Basavapatna Dattaguru
19979c298b
am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
...
* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
Revert "Video editor CTS: Framework modifications"
2011-01-26 22:52:38 -08:00
Basavapatna Dattaguru
46cbdcf03d
am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
...
* commit '3b728ca70a4fe6760b682589505d76848c47d765':
Revert "Fixes Issue ID: 3396697"
2011-01-26 22:52:31 -08:00
Basavapatna Dattaguru
5d53a1a084
Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
2011-01-26 22:50:59 -08:00
Basavapatna Dattaguru
4bdc5673cc
Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
2011-01-26 22:50:50 -08:00
Romain Guy
c1e575a033
am 38f34ed2: am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197 " into honeycomb
...
* commit '38f34ed20a52d027cbf1b72fe22c6d616810613b':
Don't draw the same triangles several times. Bug #3388197
2011-01-26 22:49:13 -08:00
Romain Guy
73843d234d
am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197 " into honeycomb
...
* commit '7c53a0d6078620df3abc4997acfe267ef903f5c6':
Don't draw the same triangles several times. Bug #3388197
2011-01-26 22:47:01 -08:00
Adam Cohen
bc46e96aa3
am a05a3e3a: am 3b52ca3b: Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb
...
* commit 'a05a3e3ad7fbb27d1629836141e9d52937299bda':
Fixing some ugly StackView relayouts on rotation
2011-01-26 22:46:57 -08:00
Adam Cohen
b30fcd220e
am 3b52ca3b: Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb
...
* commit '3b52ca3bbcb989200abff5582ef569d5f316d7f5':
Fixing some ugly StackView relayouts on rotation
2011-01-26 22:44:53 -08:00
Romain Guy
bd86097d8c
Merge "Don't draw the same triangles several times. Bug #3388197 " into honeycomb
2011-01-26 22:44:02 -08:00
Adam Cohen
c1e797065b
Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb
2011-01-26 22:41:43 -08:00
Joe Onorato
b7071faee0
am 7c77bd0e: am e193c468: Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
...
* commit '7c77bd0e3dda93242e7dbcfb4754817894483653':
Fix 3388705: Explicitly check for low battery level
2011-01-26 22:26:15 -08:00
Joe Onorato
b3caedfa76
am e193c468: Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
...
* commit 'e193c4688f9062e1d4dba97413788b6ffa122a55':
Fix 3388705: Explicitly check for low battery level
2011-01-26 22:23:56 -08:00
Joe Onorato
b44ba5fe26
Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
2011-01-26 22:21:26 -08:00
Joe Onorato
d036a4398a
am 5702e88b: am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
...
* commit '5702e88b7f7fa72acfe9a34bffde54f578b1a94a':
Revert "getRingtone is causing an anr. Turn it off for now."
2011-01-26 22:04:41 -08:00
Joe Onorato
48edeff1fd
am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
...
* commit 'ea1fbe9c8c9fe32690252dcc4dc96c93ae03f686':
Revert "getRingtone is causing an anr. Turn it off for now."
2011-01-26 22:02:18 -08:00
Joe Onorato
d62cc7b256
Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
2011-01-26 22:00:07 -08:00
Basavapatna Dattaguru
b53541f18d
am a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb
...
* commit 'a33537c3f1dbe1a4fa57560c406bf45e8f52436e':
Video editor CTS: Framework modifications
2011-01-26 21:54:16 -08:00
Basavapatna Dattaguru
d256ef1015
am 55bf9bdb: am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb
...
* commit '55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21':
Fixes Issue ID: 3396697
2011-01-26 21:52:02 -08:00
Basavapatna Dattaguru
267604df1c
am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb
...
* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
Video editor CTS: Framework modifications
2011-01-26 21:51:49 -08:00
Basavapatna Dattaguru
b0b18b9133
am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb
...
* commit '643e8476e1b9da93a06d073797863298ae268393':
Fixes Issue ID: 3396697
2011-01-26 21:49:34 -08:00
Basavapatna Dattaguru
f9f29d4c9d
Merge "Video editor CTS: Framework modifications" into honeycomb
2011-01-26 21:48:02 -08:00
Basavapatna Dattaguru
7c2066afb0
Merge "Fixes Issue ID: 3396697" into honeycomb
2011-01-26 21:47:40 -08:00
Justin Ho
7dfae49485
am 5d15cc71: am 08006286: Merge "New stat_sys_download/upload icons" into honeycomb
...
* commit '5d15cc7174388af04a9897c03bcd7e4d81e578b2':
New stat_sys_download/upload icons
2011-01-26 21:44:22 -08:00
Justin Ho
3f5353a19e
am 08006286: Merge "New stat_sys_download/upload icons" into honeycomb
...
* commit '08006286b40cf9031766a97e4d50ebb47c8b514d':
New stat_sys_download/upload icons
2011-01-26 21:41:50 -08:00
Justin Ho
039a1dc35c
Merge "New stat_sys_download/upload icons" into honeycomb
2011-01-26 21:37:22 -08:00
James Dong
da966f749e
am f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb
...
* commit 'f1e687b6e31ba4597558de94c40a73a074ba7703':
Eliminate duplicated code in export method
2011-01-26 21:20:16 -08:00
Kenny Root
cc82bdd6d0
am 1f8e2f99: am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
...
* commit '1f8e2f99585040b3904f1b6863000d9d208eda02':
Add API for preferred Launcher icon size and density
2011-01-26 21:19:59 -08:00
Xavier Ducrohet
a37b340cf6
am 8c7fd1e9: am 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
...
* commit '8c7fd1e96a012c6ebc8bdf1b38df7667456b8fcb':
LayoutLib: put a default image on the quickcontactbadge.
2011-01-26 21:19:42 -08:00
Jim Miller
bccb754a5f
am df82ad9f: am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb
...
* commit 'df82ad9fb239572f3076ffc8894697b9de3d18d1':
Fix 3381324: Restart ripples when the user moves away from the edge.
2011-01-26 21:19:36 -08:00
Justin Ho
f6039ebe86
am 5b78e092: am 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
...
* commit '5b78e092dd7a97c47169f3442e73c1c934002cbc':
Integrating xlarge mdpi battery charging assets
2011-01-26 21:19:30 -08:00
Michael Kolb
4df2eb6680
am cda2da1f: am 85fd2c91: Merge "fix incognito url loading" into honeycomb
...
* commit 'cda2da1f23f7be6dd2c41746a49ff41bf66958df':
fix incognito url loading
2011-01-26 21:19:20 -08:00
James Dong
b5b4be85ee
am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb
...
* commit '3b1fd35c6876f7eb1d15db3095c3e57969783302':
Eliminate duplicated code in export method
2011-01-26 21:15:37 -08:00
Kenny Root
20f3810ba9
am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
...
* commit '5d506fa7274e8ba84e348e11c22729b58802f796':
Add API for preferred Launcher icon size and density
2011-01-26 21:15:28 -08:00
Xavier Ducrohet
1b090b7b22
am 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
...
* commit '62461d128fcb1314d96661e77f9744e5e50f57e3':
LayoutLib: put a default image on the quickcontactbadge.
2011-01-26 21:15:22 -08:00
Jim Miller
01f8cb8dce
am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb
...
* commit '57d472a5b1f69e3aa0159f41c7ef625d4418c27f':
Fix 3381324: Restart ripples when the user moves away from the edge.
2011-01-26 21:15:17 -08:00
Justin Ho
6202fc3289
am 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
...
* commit '597e644d7a445e6f5555f3f51b6ed78b1e6c1243':
Integrating xlarge mdpi battery charging assets
2011-01-26 21:15:10 -08:00
Michael Kolb
d997a34f33
am 85fd2c91: Merge "fix incognito url loading" into honeycomb
...
* commit '85fd2c9102f7cf105bf498f05ca35360a4bcede5':
fix incognito url loading
2011-01-26 21:15:01 -08:00
James Dong
726f4d9178
Merge "Eliminate duplicated code in export method" into honeycomb
2011-01-26 20:42:18 -08:00
Kenny Root
104b2dc3ed
Merge "Add API for preferred Launcher icon size and density" into honeycomb
2011-01-26 20:16:31 -08:00
Xavier Ducrohet
196a360071
Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
2011-01-26 19:54:46 -08:00
Jim Miller
eb1b0edd61
Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb
2011-01-26 19:39:23 -08:00
Justin Ho
be6c48f741
Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
2011-01-26 19:34:50 -08:00