OSDN Git Service
Scott Main [Fri, 14 Jun 2013 18:07:21 +0000 (11:07 -0700)]
am
3b0205b7: am
0b3fe078: am
a17201a8: am
7190a059: fix transition from download to install instructions
* commit '
3b0205b7601a6fa3d7abf6dbc5a60223981103cc':
fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 18:02:41 +0000 (11:02 -0700)]
am
0b3fe078: am
a17201a8: am
7190a059: fix transition from download to install instructions
* commit '
0b3fe0785c0c6ff0ce834c06b6828f884a658730':
fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:56:28 +0000 (10:56 -0700)]
am
a17201a8: am
7190a059: fix transition from download to install instructions
* commit '
a17201a81691ac337426923d1bdcf9e0a26b841e':
fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:53:45 +0000 (10:53 -0700)]
am
7190a059: fix transition from download to install instructions
* commit '
7190a05951efa4f5cf94bb22da48dce85c52bd06':
fix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:49:55 +0000 (10:49 -0700)]
fix transition from download to install instructions
Change-Id: Ibb06779891ffab2c213b7c3401293e6fb7a6c4c9
Scott Main [Fri, 14 Jun 2013 17:25:38 +0000 (10:25 -0700)]
am
6e594289: am
d2ad6dc5: am
6af13a74: am
ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit '
6e5942894a40ed2a199f25bf4e8a215c95d2c79b':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
Scott Main [Fri, 14 Jun 2013 17:16:02 +0000 (10:16 -0700)]
am
d2ad6dc5: am
6af13a74: am
ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit '
d2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
Scott Main [Fri, 14 Jun 2013 17:12:30 +0000 (10:12 -0700)]
am
6af13a74: am
ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit '
6af13a74d3dcf56187edf153e0341221faf9f1ad':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
Scott Main [Fri, 14 Jun 2013 17:09:12 +0000 (10:09 -0700)]
am
ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit '
ec025db4a74914640c42412c63413f2d5d46e45d':
change studio version number to use 'x' for final decimal. also go to install guide after download begins
Dirk Dougherty [Fri, 14 Jun 2013 16:29:50 +0000 (09:29 -0700)]
am
f1d2c5ae: Merge "Doc change: diffs for API 18" into jb-mr2-dev
* commit '
f1d2c5aeb23739bde3708f4e4d4bdb99f059f1ed':
Doc change: diffs for API 18
Dirk Dougherty [Fri, 14 Jun 2013 16:23:11 +0000 (16:23 +0000)]
Merge "Doc change: diffs for API 18" into jb-mr2-dev
Scott Main [Fri, 14 Jun 2013 15:45:20 +0000 (08:45 -0700)]
am
92053f8b: revise docs for new sensor types. fix markup error causing tons of code font
* commit '
92053f8b28ce0d035d292fa73622200990682511':
revise docs for new sensor types. fix markup error causing tons of code font
Scott Main [Thu, 13 Jun 2013 23:32:50 +0000 (16:32 -0700)]
revise docs for new sensor types. fix markup error causing tons of code font
Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35
Dirk Dougherty [Thu, 13 Jun 2013 23:33:04 +0000 (16:33 -0700)]
Doc change: diffs for API 18
Change-Id: I92d9880959e18bb0cffa68a05a042de6d5790aa4
Scott Main [Thu, 13 Jun 2013 22:00:43 +0000 (15:00 -0700)]
change studio version number to use 'x' for final decimal.
also go to install guide after download begins
Change-Id: I9ec266b20585c00cf5a643fede2df64eb2066ebc
Scott Main [Thu, 13 Jun 2013 21:56:03 +0000 (14:56 -0700)]
am
f52532de: am
cb2a8505: am
695896a4: am
46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
* commit '
f52532de2a3da2f41ddc28e25d2883d45f189018':
add ninepatch search tag
Scott Main [Thu, 13 Jun 2013 21:54:48 +0000 (14:54 -0700)]
am
cb2a8505: am
695896a4: am
46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
* commit '
cb2a85058e24ecd35349b5470e402bcb52df2d6b':
add ninepatch search tag
Scott Main [Thu, 13 Jun 2013 21:51:47 +0000 (14:51 -0700)]
am
695896a4: am
46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
* commit '
695896a46578e7ad4e540151e799a9f0b8828ad1':
add ninepatch search tag
Scott Main [Thu, 13 Jun 2013 21:49:20 +0000 (14:49 -0700)]
am
46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
* commit '
46c8931ffc78f5204b34f7ba5098defbc318b7a4':
add ninepatch search tag
Scott Main [Thu, 13 Jun 2013 21:47:27 +0000 (21:47 +0000)]
Merge "add ninepatch search tag" into jb-mr1.1-ub-dev
The Android Open Source Project [Thu, 13 Jun 2013 15:22:44 +0000 (08:22 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Ic69db23c3b1ba493a97b162caa664759cf3b1bda
The Android Automerger [Thu, 13 Jun 2013 12:55:24 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Narayan Kamath [Thu, 13 Jun 2013 09:31:51 +0000 (02:31 -0700)]
am
372d21ad: am
6706ca96: Merge "Update HttpResponseCache to use the new cache API."
* commit '
372d21ad69a43e3d0a26b23f45351511ed88e9e6':
Update HttpResponseCache to use the new cache API.
Narayan Kamath [Thu, 13 Jun 2013 09:29:11 +0000 (02:29 -0700)]
am
6706ca96: Merge "Update HttpResponseCache to use the new cache API."
* commit '
6706ca96b21ebbd620fb597a23e8180f76bb37cf':
Update HttpResponseCache to use the new cache API.
Narayan Kamath [Thu, 13 Jun 2013 09:26:33 +0000 (09:26 +0000)]
Merge "Update HttpResponseCache to use the new cache API."
Adam Powell [Thu, 13 Jun 2013 00:38:25 +0000 (17:38 -0700)]
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
Dave Burke [Thu, 13 Jun 2013 04:11:12 +0000 (21:11 -0700)]
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"
Dave Burke [Thu, 13 Jun 2013 04:08:42 +0000 (04:08 +0000)]
Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev
Jeff Brown [Wed, 12 Jun 2013 22:57:38 +0000 (15:57 -0700)]
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
kmccormick [Thu, 13 Jun 2013 02:38:51 +0000 (19:38 -0700)]
am
4b5a6255: am
e9abc5e9: am
b89c6ac4: am
9af7d407: am
227615ee: am
bf370185: Doc update: restoring deprecation messages
* commit '
4b5a6255e096b20513468cc1f55f3038c4c53327':
Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 02:35:56 +0000 (19:35 -0700)]
am
e9abc5e9: am
b89c6ac4: am
9af7d407: am
227615ee: am
bf370185: Doc update: restoring deprecation messages
* commit '
e9abc5e935deab1c63f89971380b9f9a9eed1af9':
Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 02:33:50 +0000 (19:33 -0700)]
am
b89c6ac4: am
9af7d407: am
227615ee: am
bf370185: Doc update: restoring deprecation messages
* commit '
b89c6ac4e65c0aaadddd65d1f816860681615b1e':
Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 02:31:12 +0000 (19:31 -0700)]
am
9af7d407: am
227615ee: am
bf370185: Doc update: restoring deprecation messages
* commit '
9af7d4072849de24a0ac6401247c18c6ef915e2f':
Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 02:28:58 +0000 (19:28 -0700)]
am
227615ee: am
bf370185: Doc update: restoring deprecation messages
* commit '
227615eeb7b6008e18d2b205cadccf4943a82e94':
Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 02:26:57 +0000 (19:26 -0700)]
am
bf370185: Doc update: restoring deprecation messages
* commit '
bf3701854841f97f52cd29b601431861598f5277':
Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 01:58:49 +0000 (18:58 -0700)]
Doc update: restoring deprecation messages
Change-Id: I58ca2002043d47cc55f15cdaff581e019a6dd7ef
Dirk Dougherty [Thu, 13 Jun 2013 01:44:34 +0000 (18:44 -0700)]
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.
Dirk Dougherty [Thu, 13 Jun 2013 01:41:25 +0000 (18:41 -0700)]
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.
Dirk Dougherty [Thu, 13 Jun 2013 01:39:11 +0000 (18:39 -0700)]
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.
Dirk Dougherty [Thu, 13 Jun 2013 01:36:31 +0000 (18:36 -0700)]
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.
Dirk Dougherty [Thu, 13 Jun 2013 01:34:24 +0000 (18:34 -0700)]
am
bd9e41ba: am
fe3da794: Doc change: refresh gcore/gms reference from e-release.
* commit '
bd9e41ba72014c7412f69cafbeb775c281a36d3b':
Doc change: refresh gcore/gms reference from e-release.
Dirk Dougherty [Thu, 13 Jun 2013 01:31:26 +0000 (18:31 -0700)]
am
fe3da794: Doc change: refresh gcore/gms reference from e-release.
* commit '
fe3da794f7fb26325951338b1951bb6fdbbc0199':
Doc change: refresh gcore/gms reference from e-release.
Dirk Dougherty [Thu, 13 Jun 2013 01:06:08 +0000 (18:06 -0700)]
Doc change: refresh gcore/gms reference from e-release.
Change-Id: Ic9455b2ba0142cf310a2a509f706d90b5553fbf4
The Android Open Source Project [Thu, 13 Jun 2013 01:04:15 +0000 (18:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Icee761e7873b6c14395d33c06ad53f5bff480839
Dirk Dougherty [Thu, 13 Jun 2013 00:45:53 +0000 (17:45 -0700)]
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.
Dirk Dougherty [Thu, 13 Jun 2013 00:43:07 +0000 (17:43 -0700)]
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.
Dirk Dougherty [Thu, 13 Jun 2013 00:40:06 +0000 (17:40 -0700)]
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.
Adam Powell [Thu, 13 Jun 2013 00:38:25 +0000 (17:38 -0700)]
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
Dirk Dougherty [Thu, 13 Jun 2013 00:37:26 +0000 (17:37 -0700)]
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.
Dirk Dougherty [Thu, 13 Jun 2013 00:35:17 +0000 (17:35 -0700)]
am
47f5c410: am
57bb89f0: Doc change: Add docs for GP Purchase Status API.
* commit '
47f5c4102d096c56f9ebc71bdb351b58cfb8de42':
Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:33:37 +0000 (17:33 -0700)]
am
57bb89f0: Doc change: Add docs for GP Purchase Status API.
* commit '
57bb89f0b267140ae7f50e31ec0e3023e8836639':
Doc change: Add docs for GP Purchase Status API.
Jeff Brown [Thu, 13 Jun 2013 00:02:43 +0000 (17:02 -0700)]
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.
Jeff Brown [Wed, 12 Jun 2013 23:59:01 +0000 (23:59 +0000)]
Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev
Baligh Uddin [Wed, 12 Jun 2013 17:38:17 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6b8f9443618863dbe34ca26e5832bee11ccc014
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Jun 2013 16:52:55 +0000 (09:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I41cb7ffb3961af387e425a6a80726e1213ae10f1
Auto-generated-cl: translation import
Wink Saville [Mon, 10 Jun 2013 17:10:42 +0000 (10:10 -0700)]
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
Winson Chung [Tue, 4 Jun 2013 21:25:28 +0000 (14:25 -0700)]
Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug
9270309)
Change-Id: I6cfb8e0c586fad7360a07f98e1280a954f62e5e1
Wink Saville [Wed, 12 Jun 2013 23:16:45 +0000 (16:16 -0700)]
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.
Wink Saville [Wed, 12 Jun 2013 23:13:06 +0000 (23:13 +0000)]
Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
Dirk Dougherty [Wed, 12 Jun 2013 03:10:54 +0000 (20:10 -0700)]
Doc change: Add docs for GP Purchase Status API.
Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00
Jeff Brown [Wed, 12 Jun 2013 22:57:38 +0000 (15:57 -0700)]
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
Baligh Uddin [Wed, 12 Jun 2013 20:17:49 +0000 (13:17 -0700)]
am
909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
909b6db6a327c2102bbcaa56720428319d0d4e94':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 20:17:47 +0000 (13:17 -0700)]
am
96acc0e5: Import translations. DO NOT MERGE
* commit '
96acc0e5f16ef575e306eb8217484a5f3471f917':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 20:16:34 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 12 Jun 2013 17:38:17 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6b8f9443618863dbe34ca26e5832bee11ccc014
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Jun 2013 16:52:55 +0000 (09:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I41cb7ffb3961af387e425a6a80726e1213ae10f1
Auto-generated-cl: translation import
Narayan Kamath [Thu, 6 Jun 2013 11:16:40 +0000 (12:16 +0100)]
Update HttpResponseCache to use the new cache API.
The new API was introduced in
https://android-review.googlesource.com/#/c/59985/
Change-Id: Ie64de7fc64b818bebf1077dff407813865769387
The Android Open Source Project [Wed, 12 Jun 2013 14:23:31 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Ife328fef3a7cc1a88562fd88a85daa626b19c930
The Android Automerger [Wed, 12 Jun 2013 12:55:58 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Christopher Tate [Mon, 10 Jun 2013 23:55:02 +0000 (16:55 -0700)]
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
Jean-Michel Trivi [Fri, 7 Jun 2013 22:48:22 +0000 (15:48 -0700)]
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
Marco Nelissen [Mon, 10 Jun 2013 22:06:28 +0000 (15:06 -0700)]
Unhide MediaExtractor.getPsshInfo()
b/
9373882
Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
Scott Main [Tue, 11 Jun 2013 22:08:54 +0000 (15:08 -0700)]
add ninepatch search tag
Change-Id: Ia53e839abfccffe316b54e62da9bd89011f2251a
Christopher Tate [Tue, 11 Jun 2013 22:07:00 +0000 (15:07 -0700)]
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
Christopher Tate [Tue, 11 Jun 2013 22:04:38 +0000 (22:04 +0000)]
Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
The Android Open Source Project [Tue, 11 Jun 2013 21:56:51 +0000 (14:56 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I7100db02d39d7d91bb3c2b8eea070a48a8f7c139
Daniel Sandler [Tue, 11 Jun 2013 21:11:29 +0000 (14:11 -0700)]
am
cd5b3310: Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev
* commit '
cd5b3310e23b918fe7f49352e28f7d1b69ca859c':
Add LTE overlays for signal strength indicators.
Zhihai Xu [Tue, 11 Jun 2013 21:11:19 +0000 (14:11 -0700)]
am
bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev
* commit '
bcc6ae88f97caa7591a7507a90ec1152ee7cab7a':
Let RemoteControlDisplay know more about playback position
Scott Main [Tue, 11 Jun 2013 21:10:29 +0000 (14:10 -0700)]
am
276c72b7: am
8f678878: am
6e15b52e: am
7728e1d6: replace obsolete links. bug:
9380063
* commit '
276c72b714f0dc1b5aa49cf78924cd2af09b4c8b':
replace obsolete links. bug:
9380063
Marco Nelissen [Tue, 11 Jun 2013 21:10:26 +0000 (14:10 -0700)]
am
37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev
* commit '
374904621a79eb12416da4a26be515ae9a2d243a':
Unhide MediaExtractor.getPsshInfo()
Scott Main [Tue, 11 Jun 2013 21:10:18 +0000 (14:10 -0700)]
am
8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug:
9359960" into jb-mr2-dev
* commit '
8fb120b67d785dc5ab0ebdb8efd7988da1a94365':
add ViewGroup's layoutMode attribute to public resources bug:
9359960
Scott Main [Tue, 11 Jun 2013 21:10:16 +0000 (14:10 -0700)]
am
938e8b67: am
d731c902: am
f0380a26: am
343f581d: Merge "fix typo and clarify class references in database lesson bug:
9372560" into jb-mr1.1-ub-dev
* commit '
938e8b67c2c9d0e4c797a317a10148be42aa80ec':
fix typo and clarify class references in database lesson bug:
9372560
Baligh Uddin [Tue, 11 Jun 2013 21:10:03 +0000 (14:10 -0700)]
am
ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
ebb17713dac153a0efdbb9ec102b8a6a99242f5f':
Import translations. DO NOT MERGE
Ashish Sharma [Tue, 11 Jun 2013 21:09:56 +0000 (14:09 -0700)]
am
58100fb8: Merge "Do not allow 0 or smaller periodicity for syncs. b/
9295383" into jb-mr2-dev
* commit '
58100fb813f4a68386757fc80244dbb756ea35d5':
Do not allow 0 or smaller periodicity for syncs. b/
9295383
John Spurlock [Tue, 11 Jun 2013 21:09:53 +0000 (14:09 -0700)]
am
a9221987: Merge "Save Notification large icon to extras." into jb-mr2-dev
* commit '
a9221987c047a9a05da9cc4f3446a0d581494a85':
Save Notification large icon to extras.
Scott Main [Tue, 11 Jun 2013 21:09:47 +0000 (14:09 -0700)]
am
fe7c2220: Merge "add NA message for any "signature" level permissions" into jb-mr2-dev
* commit '
fe7c2220a129d3bea753f14f111b4f6e335de237':
add NA message for any "signature" level permissions
Chris Craik [Tue, 11 Jun 2013 21:09:41 +0000 (14:09 -0700)]
am
cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev
* commit '
cb5d644fb8956962b6a89f8d384b16819af5fdf9':
Workaround possible use after delete
Daniel Sandler [Tue, 11 Jun 2013 21:09:38 +0000 (14:09 -0700)]
am
4e5694aa: Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev
* commit '
4e5694aaa7e03723e248c0d1e47e5a322c403a90':
Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
Daniel Sandler [Tue, 11 Jun 2013 20:57:39 +0000 (20:57 +0000)]
Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev
Zhihai Xu [Tue, 11 Jun 2013 19:38:58 +0000 (19:38 +0000)]
Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev
Scott Main [Tue, 11 Jun 2013 15:03:22 +0000 (08:03 -0700)]
am
8f678878: am
6e15b52e: am
7728e1d6: replace obsolete links. bug:
9380063
* commit '
8f6788786bdd36e26b6219b94ce7288115e020af':
replace obsolete links. bug:
9380063
Scott Main [Tue, 11 Jun 2013 15:01:13 +0000 (08:01 -0700)]
am
6e15b52e: am
7728e1d6: replace obsolete links. bug:
9380063
* commit '
6e15b52e712d4c1836a06c579452ce872c1dfd91':
replace obsolete links. bug:
9380063
Scott Main [Tue, 11 Jun 2013 14:59:18 +0000 (07:59 -0700)]
am
7728e1d6: replace obsolete links. bug:
9380063
* commit '
7728e1d6543df2758687b4b62b9c626d1c3e59dd':
replace obsolete links. bug:
9380063
Scott Main [Tue, 11 Jun 2013 14:54:31 +0000 (07:54 -0700)]
replace obsolete links.
bug:
9380063
Change-Id: Ib40ce359bfd5f44494c5b378e768d73011c29636
The Android Automerger [Tue, 11 Jun 2013 12:55:18 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Marco Nelissen [Tue, 11 Jun 2013 04:01:46 +0000 (04:01 +0000)]
Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev
Christopher Tate [Mon, 10 Jun 2013 23:55:02 +0000 (16:55 -0700)]
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
Scott Main [Mon, 10 Jun 2013 23:54:10 +0000 (23:54 +0000)]
Merge "add ViewGroup's layoutMode attribute to public resources bug:
9359960" into jb-mr2-dev
Scott Main [Mon, 10 Jun 2013 23:19:13 +0000 (16:19 -0700)]
am
d731c902: am
f0380a26: am
343f581d: Merge "fix typo and clarify class references in database lesson bug:
9372560" into jb-mr1.1-ub-dev
* commit '
d731c902408b0a86deb8fce04b8391bec756f498':
fix typo and clarify class references in database lesson bug:
9372560
Scott Main [Mon, 10 Jun 2013 23:17:45 +0000 (16:17 -0700)]
am
f0380a26: am
343f581d: Merge "fix typo and clarify class references in database lesson bug:
9372560" into jb-mr1.1-ub-dev
* commit '
f0380a267c8ae9c351d5799752fe5fdb9b210800':
fix typo and clarify class references in database lesson bug:
9372560
OSDN Git Service
