The Android Automerger
d8cfc7d1aa
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-22 16:41:52 -07:00
Xavier Ducrohet
dc14aa6f1c
Merge "Update the API file for the SDK." into jb-mr1-dev
2012-10-22 12:34:43 -07:00
Xavier Ducrohet
6cee101c6f
Update the API file for the SDK.
...
Also update the platform tools to rev 16.
Change-Id: I92c8e1f99e4192212ed352f38d84d01c6a95d047
2012-10-22 12:10:32 -07:00
Geremy Condra
0303484707
Fixed runtest to work with python != 2.4
...
Change-Id: I6104adb5a6549eb4eaa3f2096633a49e4743ce50
2012-10-19 15:08:05 -07:00
The Android Automerger
cc8defb1b1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-19 06:59:22 -07:00
Xavier Ducrohet
43b41f5298
am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.
...
* commit 'bb65013d27d222ef63258a574665cd197c985580':
Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:53:58 -07:00
Xavier Ducrohet
bb65013d27
am fc848872: Update platform source.prop for new layoutlib. do not merge.
...
* commit 'fc8488729db76770c29bf9a66805fab421bf000c':
Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:50:36 -07:00
Xavier Ducrohet
fc8488729d
Update platform source.prop for new layoutlib. do not merge.
...
Change-Id: Idd813cc0c69d67e1f60e23ec0b4254d26e459ba3
2012-10-18 17:40:20 -07:00
Jeff Hamilton
3087001392
Merge "Change the name of the location config value." into jb-mr1-dev
2012-10-18 12:39:24 -07:00
The Android Automerger
56311b5943
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-18 06:59:22 -07:00
Xavier Ducrohet
06c5d2f21f
Merge "update source.prop for the sdk platform package." into jb-mr1-dev
2012-10-17 17:21:43 -07:00
Xavier Ducrohet
ab136ad100
update source.prop for the sdk platform package.
...
Uses the new Layoutlib API 9
Requires tools 21.
Change-Id: If1ced35107df4118775d95e3c44ebfd94a0f1209
2012-10-17 17:20:47 -07:00
The Android Automerger
4cce2a32b0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-17 16:07:00 -07:00
Scott Main
1cb485c8b6
am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
...
* commit 'b63a8975abad7381491aad0d85b107a9cb58ec56':
add redirect for layout-objects.html bug: 7366567
2012-10-17 15:44:15 -07:00
Scott Main
b63a8975ab
am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
...
* commit '37e24aecdee0193648a2d62d594aed8cd137bf89':
add redirect for layout-objects.html bug: 7366567
2012-10-17 15:41:21 -07:00
Scott Main
37e24aecde
am 352b33ba: add redirect for layout-objects.html bug: 7366567
...
* commit '352b33ba8bf0b590d7db8fb694ad0360265627eb':
add redirect for layout-objects.html bug: 7366567
2012-10-17 15:37:42 -07:00
Scott Main
352b33ba8b
add redirect for layout-objects.html
...
bug: 7366567
Change-Id: Ie660fd1353fc7106da1afa5df2951a3e5d9d8477
2012-10-17 11:25:09 -07:00
The Android Automerger
480774f2eb
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-16 17:30:13 -07:00
Jeff Hamilton
13dc6a2223
Change the name of the location config value.
...
This reverts commit 329b760e8e .
Bug: 7242814
2012-10-16 16:14:25 -05:00
Scott Main
b0cab80d11
am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
...
* commit '487869a86bae6246b51cee91bc4ceb543d23b317':
add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:43:56 -07:00
Scott Main
487869a86b
am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
...
* commit '05bca821e1c401bbd9dacb200aa0e6a2759c3478':
add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:41:19 -07:00
Scott Main
05bca821e1
am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
...
* commit 'ec54ca1518080e12ee042e596f2e1947917293ea':
add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:39:04 -07:00
Scott Main
ec54ca1518
add redirect from nofification summary page to Notifications doc
...
because this navigation is now flat so each doc is visible in side nav at top
Change-Id: I64e8788a8d7bb7992c410cec0c494b8157d4d651
2012-10-12 12:15:09 -07:00
The Android Automerger
018dba6896
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 11:49:50 -07:00
Laurent Tu
91d9d51f5d
Return accuracy in GPS emulation
...
Accuracy is now a required field for location. To comply, set an
accuracy in returned fix. The accuracy is constant for now since
computing it from the NMEA sentence seems to be very complicated.
Bug: 6864500
Change-Id: Iff4c36b440b095539c717d35a812ee2ed7c1725f
2012-10-11 20:43:53 -07:00
The Android Automerger
9cf43ae934
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 16:26:22 -07:00
Dianne Hackborn
9da0812284
More on issue #7318666 : hide developer options from user build
...
The Dev Tools app now tries to add a link to Development Settings
at the top of its list.
Also add a new "Development Settings" app that directly takes you
to the development settings activity, as a stand-alone app that
could be distributed as a regular third party app.
Change-Id: I8fe2b6a32cf4e37d69f4ce7b8d646a147b492d99
2012-10-10 19:01:09 -07:00
The Android Automerger
c4351cf30e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 06:59:14 -07:00
Jeff Sharkey
c9ff3bce8b
Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
2012-10-09 23:47:12 -07:00
Brian Muramatsu
c6fbad006a
Merge "Make all monkeys do the same thing" into jb-mr1-dev
2012-10-09 19:12:39 -07:00
Kenny Root
3cbf850ab6
Make all monkeys do the same thing
...
Monkeys were using SecureRandom, but what it really wanted was an LCRNG
that allowed it to reproduce the same output with seeds. This change
allows the monkeys to shine.
Bug: 6950454
Change-Id: Iabf0fc5e7d50b786fa32b946e85de797220ff569
2012-10-09 13:57:13 -07:00
Raphael Moll
c1a8e1ec87
resolved conflicts for merge of d6308897 to jb-mr1-dev
...
Change-Id: Iffbbb75a504e5f8b0caa5690835e17a4b6ab63bb
2012-10-09 13:44:41 -07:00
Jeff Sharkey
1d7f24de42
Follow RegisteredServicesCache API changes.
...
Bug: 7276595
Change-Id: I6064684380b7bbbec87c2345f782931d731ad5cb
2012-10-09 13:05:04 -07:00
Raphael Moll
d6308897c0
am 37191b53: SDK JB MR0: doc is 16 rev 3
...
* commit '37191b53de90cde879c167d1db74d5a73740f4c0':
SDK JB MR0: doc is 16 rev 3
2012-10-09 12:53:20 -07:00
Raphael Moll
37191b53de
SDK JB MR0: doc is 16 rev 3
...
Change-Id: I7e28e4dc1981c7d9502a45f3509245075da98a00
2012-10-09 12:48:10 -07:00
The Android Automerger
b414234ed9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-08 06:59:08 -07:00
Eino-Ville Talvala
41ee0fdc33
testrunner: Match test runner name for hardware tests.
...
Change-Id: I9db719e3dde258c026e0e721e0dd58f80378f199
2012-10-05 17:12:42 -07:00
Jeff Hamilton
329b760e8e
Revert "Change the name of the location config value."
...
This reverts commit c3e2dac377 .
2012-10-05 02:30:33 -05:00
Jeff Hamilton
c3e2dac377
Change the name of the location config value.
...
Bug: 7242814
Change-Id: I96867f8c2ed886ea6895849c057fc0e37813ce47
2012-10-04 11:00:40 -05:00
The Android Automerger
1c723d9eac
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-04 06:59:20 -07:00
Joe Fernandez
177c547e32
am 835ae05a: am 8ffbb8fd: am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
...
* commit '835ae05aff3d65cdd14344c8183d52e7bfe5cbc7':
docs: Add redirect for Android Open Accessory protocol content to source.android.com
2012-10-03 16:27:19 -07:00
Joe Fernandez
835ae05aff
am 8ffbb8fd: am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
...
* commit '8ffbb8fdd6e75e3067bed62487acfab91c14fcb2':
docs: Add redirect for Android Open Accessory protocol content to source.android.com
2012-10-03 16:24:42 -07:00
Joe Fernandez
8ffbb8fdd6
am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
...
* commit '6a705429d4a70d1d75adec16499bbcd18ee9a019':
docs: Add redirect for Android Open Accessory protocol content to source.android.com
2012-10-03 16:21:30 -07:00
Joe Fernandez
6a705429d4
docs: Add redirect for Android Open Accessory protocol content to
...
source.android.com
Change-Id: Ibe6cca5848564a6a5e32ed742a49b26e36754dcb
2012-10-03 16:04:10 -07:00
The Android Automerger
6aa2a9c781
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 06:59:19 -07:00
Andy Stadler
de479873e5
Classpath cleanups - DO NOT MERGE
...
* Add external/mp4parser
* Cleanup after Email rewinding
This does not affect system image builds at all - just fixes eclipse
workspace so there are no errors reported.
Change-Id: I2aee831e460b4acb63b2b999bab4131a08af6bd9
2012-10-02 16:40:54 -07:00
The Android Automerger
071fde625a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 06:59:19 -07:00
Baligh Uddin
6b03c84e6e
Use more secure exponent for generating keys
...
Bug: 7246090
Change-Id: Ic6cbac975fcb96b436e27a87b1f81b5e3dac6321
2012-09-28 11:30:10 -07:00
The Android Automerger
708cf98801
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-27 06:59:22 -07:00
Jeff Sharkey
7b4874660e
Clean up Global settings stragglers.
...
Bug: 7242121
Change-Id: I27fd307e2ee4854558a6f6e4d2fdbbae3e89ffe0
2012-09-26 17:10:48 -07:00