OSDN Git Service
Robert Greenwalt [Fri, 19 Jul 2013 20:37:41 +0000 (13:37 -0700)]
am
b5bf655c: am
e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit '
b5bf655cc6cc9128aec99958cce3b054348c9273':
Add gservices updater for carrier provisioning url
Jean-Michel Trivi [Fri, 19 Jul 2013 20:37:38 +0000 (13:37 -0700)]
am
f65c9189: am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
f65c9189843ea55fc3e3c7154331c9f0ad330210':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:37:35 +0000 (13:37 -0700)]
am
df43ba82: am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
df43ba82e6c232985a95c9827f7d71dd3194e0a8':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:37:32 +0000 (13:37 -0700)]
am
a2f41b23: am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
a2f41b23b6328b0ff3bb04d4a88ccf4a84a50375':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:37:28 +0000 (13:37 -0700)]
am
0f33e44f: am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
0f33e44fbc2e506fce71bf087a0b18b7979daaf9':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:37:25 +0000 (13:37 -0700)]
am
2445880c: am
ba8a5413: Fix missing lock in power manager.
* commit '
2445880c5cb6504455bd5cae38a850744f4804be':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:37:22 +0000 (13:37 -0700)]
am
a64325f6: am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
a64325f6e70569255ff395a85ec161f3230f9e35':
Remove iterators (DO NOT MERGE)
Robert Greenwalt [Fri, 19 Jul 2013 20:33:35 +0000 (13:33 -0700)]
am
e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit '
e874bd351f7b68cead889f55afba505fb5fac97c':
Add gservices updater for carrier provisioning url
Jean-Michel Trivi [Fri, 19 Jul 2013 20:33:30 +0000 (13:33 -0700)]
am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
bbc9a62a71dd35c30eed96db9d4e23a754b55d8d':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:33:19 +0000 (13:33 -0700)]
am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
e3badc10112b76db583736767849b2f82ae737fd':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:33:17 +0000 (13:33 -0700)]
am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
bf8be2eefb1f5172582f688cbc090ec04d6908f1':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:33:05 +0000 (13:33 -0700)]
am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
0987ff8768512c3d519a5d5bbe5c4eb6b54548dc':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:32:48 +0000 (13:32 -0700)]
am
ba8a5413: Fix missing lock in power manager.
* commit '
ba8a54136d184d48fbed4f7b27734f645e4e8ad0':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:32:40 +0000 (13:32 -0700)]
am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
7c6be10d314413bb7afbed41017343320319915d':
Remove iterators (DO NOT MERGE)
Elliott Hughes [Thu, 18 Jul 2013 17:41:41 +0000 (10:41 -0700)]
am
0bad5370: Merge "Handle missing and invalid numeric values in XmlUtils."
* commit '
0bad537093ed5b493e4c2af778cf802a2cf2c15f':
Handle missing and invalid numeric values in XmlUtils.
Elliott Hughes [Thu, 18 Jul 2013 17:38:57 +0000 (17:38 +0000)]
Merge "Handle missing and invalid numeric values in XmlUtils."
Elliott Hughes [Thu, 18 Jul 2013 16:36:48 +0000 (09:36 -0700)]
am
15cb526e: Merge "Fix import after okhttp update."
* commit '
15cb526ece1420b1ae2061e20fd0982d82b41aae':
Fix import after okhttp update.
Elliott Hughes [Thu, 18 Jul 2013 16:33:40 +0000 (16:33 +0000)]
Merge "Fix import after okhttp update."
Narayan Kamath [Thu, 18 Jul 2013 12:42:50 +0000 (13:42 +0100)]
Fix import after okhttp update.
OkResponseCache moved packages in change
62321.
Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
Robert Greenwalt [Wed, 17 Jul 2013 23:46:25 +0000 (23:46 +0000)]
Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
Jean-Michel Trivi [Wed, 17 Jul 2013 22:38:57 +0000 (15:38 -0700)]
Cleaner Tejat notification in Audio Package 11
Add a reworked version of "Tejat", at 48kHz.
The original asset is "/data/sounds//notifications/wav/Deneb.wav".
Use this new version in Audio Package 11 under its original name.
Bug
9900161
Change-Id: I4d7c73715db4e52f5c89aeca726f8b314e0895d5
Robert Greenwalt [Tue, 16 Jul 2013 19:06:09 +0000 (12:06 -0700)]
Add gservices updater for carrier provisioning url
bug:
9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Wink Saville [Wed, 17 Jul 2013 18:43:30 +0000 (18:43 +0000)]
Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
Deepanshu Gupta [Wed, 17 Jul 2013 18:38:42 +0000 (18:38 +0000)]
Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
Roman Nurik [Wed, 17 Jul 2013 16:17:14 +0000 (16:17 +0000)]
Merge "Add Flo to device art generator." into jb-mr2-dev
Wink Saville [Wed, 17 Jul 2013 00:16:37 +0000 (17:16 -0700)]
When a SIM is changed check mobile provisioning.
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.
Bug:
9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21
Adam Powell [Wed, 17 Jul 2013 00:06:36 +0000 (17:06 -0700)]
am
30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"
* commit '
30ad720304790b07112b87f973a7e6ed5e1e6ee5':
Consider mScrollX when drawing the checkMarkDrawable
Adam Powell [Wed, 17 Jul 2013 00:04:28 +0000 (00:04 +0000)]
Merge "Consider mScrollX when drawing the checkMarkDrawable"
Jeff Brown [Tue, 16 Jul 2013 22:18:19 +0000 (15:18 -0700)]
Fix missing lock in power manager.
The display wake lock and other internal state could become
out of sync if we happened to execute the power manager's update
function concurrently due to the missing lock.
This bug can be trigged due to display state changes or proximity
sensor updated. Although it would be extremely rare, we have
some evidence of this happening on at least a few devices resulting
in rapid power drain with the screen off or a crash.
Bug:
9880044
Change-Id: I3c674ce429621a50cbb36c3a01883d5f388205b2
(cherry picked from commit
d91e417b06388694db213257b4df6b4dd78e0d49)
Roman Nurik [Tue, 16 Jul 2013 21:32:12 +0000 (14:32 -0700)]
Add Flo to device art generator.
Change-Id: I69e5d3ff3685c250d3c44bc616aec515ebc4835e
Craig Mautner [Tue, 16 Jul 2013 19:30:28 +0000 (12:30 -0700)]
Remove iterators (DO NOT MERGE)
Remove DisplayContentsIterator and AllWindowsIterator. These were cute
but they take up valuable resources. Iterate over ArrayList members
in their place.
Change-Id: Ie0c537608532cfb36f34d976cc6eacd21bad98cd
The Android Open Source Project [Mon, 15 Jul 2013 16:32:49 +0000 (09:32 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
The Android Automerger [Mon, 15 Jul 2013 15:19:11 +0000 (08:19 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Deepanshu Gupta [Fri, 12 Jul 2013 22:24:51 +0000 (15:24 -0700)]
Add orientation to configuration for layoutlib.
Update the configuration with the device orientation before rendering.
Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
Adam Powell [Fri, 12 Jul 2013 22:11:41 +0000 (15:11 -0700)]
am
1dc3b790: am
4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '
1dc3b790df61aa95cb68da390045249c59049fcd':
PreferenceActivity should not leave message in looper when destroyed
Adam Powell [Fri, 12 Jul 2013 22:09:54 +0000 (15:09 -0700)]
am
4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '
4b8cc94cc67d760e724c56aee9301d1bcc2bbe89':
PreferenceActivity should not leave message in looper when destroyed
Adam Powell [Fri, 12 Jul 2013 22:07:04 +0000 (22:07 +0000)]
Merge "PreferenceActivity should not leave message in looper when destroyed"
Scott Main [Fri, 12 Jul 2013 21:28:40 +0000 (14:28 -0700)]
am
797a99ff: am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
797a99ff3e7e1fd81f8def2e5ca4ea089c01ad06':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:22:48 +0000 (14:22 -0700)]
am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
c0f5bb70b72c25c0057d2318bbcc8d79553d1e12':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:20:11 +0000 (14:20 -0700)]
am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
ca4b112eb243b1350aba000c4f021574be25bd96':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:17:30 +0000 (14:17 -0700)]
am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
546ac85a834cf033cf1f3ce82624f1f4a63d099f':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:15:15 +0000 (14:15 -0700)]
am
ad17523d: add warning for Windows users and fix typos
* commit '
ad17523da976c2d6b7b70fd3aa9ad290e4731224':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 18:28:01 +0000 (11:28 -0700)]
add warning for Windows users and fix typos
Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3
Wink Saville [Fri, 12 Jul 2013 19:03:53 +0000 (12:03 -0700)]
am
42a85412: am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
42a85412d12078f36c3fdeda1211bdc3800bab0c':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Fri, 12 Jul 2013 19:01:41 +0000 (12:01 -0700)]
am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
925ec03fcd9651ff4c6b04982eb6d930b16493b9':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Fri, 12 Jul 2013 18:59:03 +0000 (18:59 +0000)]
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
Amith Yamasani [Fri, 12 Jul 2013 18:21:27 +0000 (11:21 -0700)]
am
1a1a7c08: am
06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '
1a1a7c0878320b94d01da6bdfaa857c85b4199a3':
Pass along the user id to AttributeCache requests
Amith Yamasani [Fri, 12 Jul 2013 18:19:24 +0000 (11:19 -0700)]
am
06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '
06a441de3b6756cf49879ff445ac26c66da54d02':
Pass along the user id to AttributeCache requests
Amith Yamasani [Fri, 12 Jul 2013 18:17:09 +0000 (18:17 +0000)]
Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
The Android Open Source Project [Fri, 12 Jul 2013 14:27:43 +0000 (07:27 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f
Hiroaki Kuriyama [Fri, 16 Nov 2012 09:46:49 +0000 (18:46 +0900)]
PreferenceActivity should not leave message in looper when destroyed
When a PreferenceActivity is destroyed as soon as created,
there is a problematic case that messages for the activity are
sometimes left in the looper even after the activity is destroyed.
For example, by clearing user data of the selecting IME on
Settings apk, com.android.settings.Settings is re-launched
2 times successively. (Destory->Create->Destroy->Create)
Due to the left message, application crash can happen.
(NullPointerException at BackStackRecord.getBreadCrumbTitle())
Two cases have been found to observe this issue.
[Case 1]
1,Launch IME in advance.
2,Go to Settings >Apps > All and choose the IME package.
3,Click "Clear data"
4,Application crash occurs on com.android.settings.
[Case 2]
1,Go to Settings > Language&input > Language.
2,ListView dialog to choose language is shown.
3,Rotate the tablet 180 degree so that 90 degree rotation occurs twice.
4,Application crash occurs on com.android.settings.
Change-Id: I5ce36ea7a40ab7bc7737b7dca6641a4c3d77a480
Elliott Hughes [Fri, 12 Jul 2013 01:55:54 +0000 (18:55 -0700)]
am
f094eefc: am
c5de9c35: Merge "Track libcore API update."
* commit '
f094eefc34013c7167effa558b488709eaa54751':
Track libcore API update.
Elliott Hughes [Fri, 12 Jul 2013 01:52:11 +0000 (18:52 -0700)]
am
c5de9c35: Merge "Track libcore API update."
* commit '
c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc':
Track libcore API update.
Scott Main [Fri, 12 Jul 2013 01:14:52 +0000 (18:14 -0700)]
am
a60edcbe: am
c079e43f: am
e920ab1a: am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
a60edcbee7d99058eb689761097826adac0593e7':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Scott Main [Fri, 12 Jul 2013 01:12:01 +0000 (18:12 -0700)]
am
c079e43f: am
e920ab1a: am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
c079e43fc317087ae5517ee7d9a376e97fef0f57':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Scott Main [Fri, 12 Jul 2013 01:09:53 +0000 (18:09 -0700)]
am
e920ab1a: am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
e920ab1a82327976e0a25842d7d57dc7a92ba604':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Dirk Dougherty [Fri, 12 Jul 2013 01:08:36 +0000 (18:08 -0700)]
am
e34e6520: am
e4709679: am
c1addd47: am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
e34e65203f8188849cfebb901c4efe5b5b4ad8d5':
Doc change: Update gcore reference docs.
Scott Main [Fri, 12 Jul 2013 01:08:01 +0000 (18:08 -0700)]
am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
a618e93891603f825fd2c0ec1a67c96c29863dcd':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Dirk Dougherty [Fri, 12 Jul 2013 01:06:22 +0000 (18:06 -0700)]
am
e4709679: am
c1addd47: am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
e4709679198590fa37fbad67df0d7e3827c4f8cf':
Doc change: Update gcore reference docs.
Scott Main [Fri, 12 Jul 2013 01:05:44 +0000 (18:05 -0700)]
am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
c660c608e75791d5b4b286f34a9ec335f9e95ba6':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Scott Main [Fri, 12 Jul 2013 01:03:22 +0000 (01:03 +0000)]
Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
Dirk Dougherty [Fri, 12 Jul 2013 01:03:17 +0000 (18:03 -0700)]
am
c1addd47: am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
c1addd4750be5b1721a8668a110e74fa59e476c6':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 01:01:26 +0000 (18:01 -0700)]
am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
c7da42d76470c4e9fb541058e942e31163275b83':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:59:22 +0000 (17:59 -0700)]
am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
f7832a35f3961e1b6665b5428899cdad598f0544':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:56:35 +0000 (17:56 -0700)]
am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
d6bbda24150eddc59865133377f6b41c8a1ed3b5':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:54:00 +0000 (17:54 -0700)]
am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
bc5f9b66744b76c676543902d31d324f2dd02d09':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:50:59 +0000 (00:50 +0000)]
Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
Scott Main [Fri, 12 Jul 2013 00:46:29 +0000 (17:46 -0700)]
am
334f6ea6: am
24810c6f: am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
334f6ea68945dd642e6a924bf399d2afd21bf107':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:44:09 +0000 (17:44 -0700)]
am
24810c6f: am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
24810c6f5854e595b2c78f9c3e44b7d4045a7472':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:41:48 +0000 (17:41 -0700)]
am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
3c13e5284e83390301bf3306e5d77f7014483ea0':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:38:31 +0000 (17:38 -0700)]
am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
536fa1bbe10b793e7c5d585c974693349fb8a4f5':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:36:53 +0000 (17:36 -0700)]
am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
84ad0894be13b374b9b75e204dabea6a1579e131':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:26:13 +0000 (17:26 -0700)]
fix markup error in download button and fix transition to install/update guide
Change-Id: I54b6ed06247ff7456089058549e373a19d9e5016
Jeff Sharkey [Thu, 11 Jul 2013 18:18:53 +0000 (11:18 -0700)]
Recover from corrupt network stats.
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.
Bug:
9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
Robert Greenwalt [Fri, 12 Jul 2013 00:09:14 +0000 (17:09 -0700)]
am
56a7e4ad: am
116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
* commit '
56a7e4ad43eb5288a80b34566db365aaaa845e87':
Block Wifi P2p discovery while doing dhcp.
Robert Greenwalt [Fri, 12 Jul 2013 00:07:06 +0000 (17:07 -0700)]
am
116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
* commit '
116d46659889f588fa9ffa5e1bc4dda90067fce6':
Block Wifi P2p discovery while doing dhcp.
Robert Greenwalt [Fri, 12 Jul 2013 00:04:45 +0000 (00:04 +0000)]
Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
Scott Main [Thu, 11 Jul 2013 23:50:57 +0000 (16:50 -0700)]
am
7afc5ca3: am
57b0fed7: am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
7afc5ca353c9b4a3839c988fe6c281289495a18a':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:47:53 +0000 (16:47 -0700)]
am
57b0fed7: am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
57b0fed7a9a1a1fe6ed5dce3bb6855f03c1b15a8':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:44:58 +0000 (16:44 -0700)]
am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
603c3d8a9ac2b81be0ea09690ba324e2ed744ccd':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:42:47 +0000 (16:42 -0700)]
am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
3e82a9c9a5339dca5f4a91c6e5822906cd632ae2':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:40:11 +0000 (16:40 -0700)]
am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
276f0ce4df7f58786da08c34f548456129144aed':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 22:31:10 +0000 (15:31 -0700)]
update Android Studio for v0.2.0.
add release notes and troubleshooting topics
Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9
Scott Main [Tue, 9 Jul 2013 17:43:45 +0000 (10:43 -0700)]
add Toshiba usb driver link
delete Fujitsu-Toshiba
bug:
9755017
Change-Id: If1417c7e697a2bea9fbdd3086ffeaf1528627364
Jeff Sharkey [Thu, 11 Jul 2013 18:41:24 +0000 (11:41 -0700)]
am
f8b69275: am
1f99a483: Recover from corrupt network stats.
* commit '
f8b692754f7739e11c8438ab59c0760194cfacc5':
Recover from corrupt network stats.
Jeff Sharkey [Thu, 11 Jul 2013 18:38:50 +0000 (11:38 -0700)]
am
1f99a483: Recover from corrupt network stats.
* commit '
1f99a483e410811473b12d8efedd79c738df7af3':
Recover from corrupt network stats.
Jeff Sharkey [Thu, 11 Jul 2013 18:18:53 +0000 (11:18 -0700)]
Recover from corrupt network stats.
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.
Bug:
9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
Robert Greenwalt [Fri, 28 Jun 2013 22:55:28 +0000 (15:55 -0700)]
Block Wifi P2p discovery while doing dhcp.
bug:
9531609
bug:
9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1
Elliott Hughes [Thu, 11 Jul 2013 17:09:14 +0000 (17:09 +0000)]
Merge "Track libcore API update."
Elliott Hughes [Thu, 11 Jul 2013 17:06:35 +0000 (10:06 -0700)]
Track libcore API update.
Change-Id: I7ad4ee87008c2ba0f8f16d1c86d81b8114359e04
Wink Saville [Thu, 11 Jul 2013 06:00:07 +0000 (23:00 -0700)]
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug:
9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
Dirk Dougherty [Fri, 28 Jun 2013 21:04:39 +0000 (14:04 -0700)]
Doc change: Update gcore reference docs.
Change-Id: I9064969741598663ba7a732054ee378d3a14da7e
Amith Yamasani [Wed, 10 Jul 2013 23:18:01 +0000 (16:18 -0700)]
Pass along the user id to AttributeCache requests
Bug:
9759331
Change-Id: Ib96ba6a89c58edc207021aa43a2b67b4f6c50117
The Android Open Source Project [Wed, 10 Jul 2013 15:34:50 +0000 (08:34 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I933252f3cee48c449df3ea2493e16d8652723ffc
The Android Automerger [Wed, 10 Jul 2013 12:55:25 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Elliott Hughes [Wed, 10 Jul 2013 00:53:32 +0000 (17:53 -0700)]
Elliott Hughes [Wed, 10 Jul 2013 00:51:34 +0000 (17:51 -0700)]
Elliott Hughes [Wed, 10 Jul 2013 00:48:52 +0000 (00:48 +0000)]
Merge "Fix build."
Elliott Hughes [Wed, 10 Jul 2013 00:48:11 +0000 (17:48 -0700)]
Fix build.
Change-Id: Icdbf7811e7acb8bed372def3beec8385a631713a
The Android Open Source Project [Wed, 10 Jul 2013 00:13:13 +0000 (17:13 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id09bc212bd1e6901188ca5019663d19c6d9f049a
OSDN Git Service
