Dave Burke
bafc8dcf69
am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev
...
* commit '34bc73dff1f0c8402da3fc9bd1f0175bddcaa842':
Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
2013-06-12 21:11:12 -07:00
Dave Burke
34bc73dff1
Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev
2013-06-13 04:08:42 +00:00
kmccormick
40609ff0fd
am 4b5a6255: am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages
...
* commit '4b5a6255e096b20513468cc1f55f3038c4c53327':
Doc update: restoring deprecation messages
2013-06-12 19:38:51 -07:00
kmccormick
4b5a6255e0
am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages
...
* commit 'e9abc5e935deab1c63f89971380b9f9a9eed1af9':
Doc update: restoring deprecation messages
2013-06-12 19:35:56 -07:00
kmccormick
e9abc5e935
am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages
...
* commit 'b89c6ac4e65c0aaadddd65d1f816860681615b1e':
Doc update: restoring deprecation messages
2013-06-12 19:33:50 -07:00
kmccormick
b89c6ac4e6
am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages
...
* commit '9af7d4072849de24a0ac6401247c18c6ef915e2f':
Doc update: restoring deprecation messages
2013-06-12 19:31:12 -07:00
kmccormick
9af7d40728
am 227615ee: am bf370185: Doc update: restoring deprecation messages
...
* commit '227615eeb7b6008e18d2b205cadccf4943a82e94':
Doc update: restoring deprecation messages
2013-06-12 19:28:58 -07:00
kmccormick
227615eeb7
am bf370185: Doc update: restoring deprecation messages
...
* commit 'bf3701854841f97f52cd29b601431861598f5277':
Doc update: restoring deprecation messages
2013-06-12 19:26:57 -07:00
kmccormick
bf37018548
Doc update: restoring deprecation messages
...
Change-Id: I58ca2002043d47cc55f15cdaff581e019a6dd7ef
2013-06-12 19:15:58 -07:00
Dirk Dougherty
1e00aa877b
am fa42499b: am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.
...
* commit 'fa42499bd51cb07e54c90d21ce80e4d6a8c04e41':
Doc change: refresh gcore/gms reference from e-release.
2013-06-12 18:44:34 -07:00
Dirk Dougherty
fa42499bd5
am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.
...
* commit '14ef5964255730a838301d3eb7ab38a2eb745ba6':
Doc change: refresh gcore/gms reference from e-release.
2013-06-12 18:41:25 -07:00
Dirk Dougherty
14ef596425
am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.
...
* commit '5161fdf3039c4e31e498c259ca4bffae18d99331':
Doc change: refresh gcore/gms reference from e-release.
2013-06-12 18:39:11 -07:00
Dirk Dougherty
5161fdf303
am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.
...
* commit 'e5bde8e03574a17fea7c078ee00fb882eb3ec829':
Doc change: refresh gcore/gms reference from e-release.
2013-06-12 18:36:31 -07:00
Dirk Dougherty
e5bde8e035
am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release.
...
* commit 'bd9e41ba72014c7412f69cafbeb775c281a36d3b':
Doc change: refresh gcore/gms reference from e-release.
2013-06-12 18:34:24 -07:00
Dirk Dougherty
bd9e41ba72
am fe3da794: Doc change: refresh gcore/gms reference from e-release.
...
* commit 'fe3da794f7fb26325951338b1951bb6fdbbc0199':
Doc change: refresh gcore/gms reference from e-release.
2013-06-12 18:31:26 -07:00
Dirk Dougherty
fe3da794f7
Doc change: refresh gcore/gms reference from e-release.
...
Change-Id: Ic9455b2ba0142cf310a2a509f706d90b5553fbf4
2013-06-12 18:06:08 -07:00
The Android Open Source Project
e2ae01114d
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Icee761e7873b6c14395d33c06ad53f5bff480839
2013-06-12 18:04:15 -07:00
Dirk Dougherty
80d5653110
am 95793530: am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.
...
* commit '9579353081f4857c6a9672675dca22182b588e31':
Doc change: Add docs for GP Purchase Status API.
2013-06-12 17:45:53 -07:00
Dirk Dougherty
9579353081
am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.
...
* commit '2b336ce4d8f740715a5b2f2cc8fb07a99300ce73':
Doc change: Add docs for GP Purchase Status API.
2013-06-12 17:43:07 -07:00
Dirk Dougherty
2b336ce4d8
am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.
...
* commit '94e207b95799125dcc6ea65eb68697a6568579a3':
Doc change: Add docs for GP Purchase Status API.
2013-06-12 17:40:06 -07:00
Adam Powell
fc93d0c108
Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
...
This reverts commit ef2277ec5802143b8af1da32d7b01518401b97a9.
This caused a regression for some apps relying on the old behavior.
Bug 9372495
2013-06-12 17:38:25 -07:00
Dirk Dougherty
94e207b957
am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.
...
* commit '3574bef4625402a99224a9c1051b295ed9fa0645':
Doc change: Add docs for GP Purchase Status API.
2013-06-12 17:37:26 -07:00
Dirk Dougherty
3574bef462
am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.
...
* commit '47f5c4102d096c56f9ebc71bdb351b58cfb8de42':
Doc change: Add docs for GP Purchase Status API.
2013-06-12 17:35:17 -07:00
Dirk Dougherty
47f5c4102d
am 57bb89f0: Doc change: Add docs for GP Purchase Status API.
...
* commit '57bb89f0b267140ae7f50e31ec0e3023e8836639':
Doc change: Add docs for GP Purchase Status API.
2013-06-12 17:33:37 -07:00
Jeff Brown
18c3bbfb78
am a37c3f18: Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev
...
* commit 'a37c3f18e64f45d19a019ab47429413481fded9f':
Fix logspam when battery sysfs file not available.
2013-06-12 17:02:43 -07:00
Jeff Brown
a37c3f18e6
Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev
2013-06-12 23:59:01 +00:00
Baligh Uddin
5ac124384f
Import translations. DO NOT MERGE
...
Change-Id: Ic6b8f9443618863dbe34ca26e5832bee11ccc014
Auto-generated-cl: translation import
2013-06-12 16:24:59 -07:00
Baligh Uddin
c4a12e1596
Import translations. DO NOT MERGE
...
Change-Id: I41cb7ffb3961af387e425a6a80726e1213ae10f1
Auto-generated-cl: translation import
2013-06-12 16:24:51 -07:00
Wink Saville
a8489beed5
Allow carrier provisioning to turn toggle radio power.
...
Previously CarrierProvisioning toggle airplane mode, but now that's
available only by the system.
Bug: 9356811
Change-Id: I5167f8614c07bafb688983a360a008f76403b2b8
2013-06-12 16:24:42 -07:00
Winson Chung
27979946cb
Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)
...
Change-Id: I6cfb8e0c586fad7360a07f98e1280a954f62e5e1
2013-06-12 16:24:33 -07:00
Wink Saville
ac6c862196
am 30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
...
* commit '30af45f47fd71feee0f9e5f8e049ba0380bc7793':
Allow carrier provisioning to turn toggle radio power.
2013-06-12 16:16:45 -07:00
Wink Saville
30af45f47f
Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
2013-06-12 23:13:06 +00:00
Dirk Dougherty
57bb89f0b2
Doc change: Add docs for GP Purchase Status API.
...
Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00
2013-06-12 16:06:36 -07:00
Jeff Brown
04c699218a
Fix logspam when battery sysfs file not available.
...
This was a regression caused by a recent change to use String8
instead of char*. We missed the implicit null check here.
Bug: 9377604
Change-Id: I7eff138096622c47b5d45678010373dc82138384
2013-06-12 15:57:38 -07:00
Baligh Uddin
414fec2522
am 909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '909b6db6a327c2102bbcaa56720428319d0d4e94':
Import translations. DO NOT MERGE
2013-06-12 13:17:49 -07:00
Baligh Uddin
05cb82caee
am 96acc0e5: Import translations. DO NOT MERGE
...
* commit '96acc0e5f16ef575e306eb8217484a5f3471f917':
Import translations. DO NOT MERGE
2013-06-12 13:17:47 -07:00
Baligh Uddin
909b6db6a3
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-06-12 20:16:34 +00:00
Baligh Uddin
d4f64a317a
Import translations. DO NOT MERGE
...
Change-Id: Ic6b8f9443618863dbe34ca26e5832bee11ccc014
Auto-generated-cl: translation import
2013-06-12 10:38:17 -07:00
Baligh Uddin
96acc0e5f1
Import translations. DO NOT MERGE
...
Change-Id: I41cb7ffb3961af387e425a6a80726e1213ae10f1
Auto-generated-cl: translation import
2013-06-12 09:52:55 -07:00
The Android Open Source Project
fabda5894c
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: Ife328fef3a7cc1a88562fd88a85daa626b19c930
2013-06-12 07:23:31 -07:00
The Android Automerger
b543526c97
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-12 05:55:58 -07:00
Christopher Tate
0041684255
Need to explicitly disable scan-always when turning off wifi
...
... when you want wifi to be really most sincerely off, because
settings restore is about to rewrite the conf file.
Bug 9032154
Change-Id: I6a3a34ac3f14ec43aa9d9cc0159fca6168ccd0a2
2013-06-11 17:53:08 -07:00
Jean-Michel Trivi
d61650a0ad
Let RemoteControlDisplay know more about playback position
...
The BT stack needs to differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.
Bug 9294855
Change-Id: I05cba82a073e6e0aaea1d8bbf9cc8c99da715f58
2013-06-11 17:52:58 -07:00
Marco Nelissen
05e2b6be66
Unhide MediaExtractor.getPsshInfo()
...
b/9373882
Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
2013-06-11 17:52:50 -07:00
Christopher Tate
1bc14ed9c3
am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
...
* commit '76b76666f5c28751db6ed8791fd54ec430d4361a':
Need to explicitly disable scan-always when turning off wifi
2013-06-11 15:07:00 -07:00
Christopher Tate
76b76666f5
Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
2013-06-11 22:04:38 +00:00
The Android Open Source Project
799f031a64
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I7100db02d39d7d91bb3c2b8eea070a48a8f7c139
2013-06-11 14:56:52 -07:00
Daniel Sandler
4a9fcaf49f
am cd5b3310: Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev
...
* commit 'cd5b3310e23b918fe7f49352e28f7d1b69ca859c':
Add LTE overlays for signal strength indicators.
2013-06-11 14:11:29 -07:00
Zhihai Xu
36e90664c7
am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev
...
* commit 'bcc6ae88f97caa7591a7507a90ec1152ee7cab7a':
Let RemoteControlDisplay know more about playback position
2013-06-11 14:11:19 -07:00
Scott Main
994c7b4768
am 276c72b7: am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete links. bug: 9380063
...
* commit '276c72b714f0dc1b5aa49cf78924cd2af09b4c8b':
replace obsolete links. bug: 9380063
2013-06-11 14:10:29 -07:00
