Scott Main
|
2ee100c099
|
am e0329cae: am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
* commit 'e0329cae82dac7a650d505f9baafbd98e511e339':
update eclipse download URL; /mobile URL will be deprecated
|
2013-05-28 11:51:08 -07:00 |
|
Scott Main
|
e0329cae82
|
am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
* commit '5bd6794468df7f7900f1e0a37c24653dd524a5c8':
update eclipse download URL; /mobile URL will be deprecated
|
2013-05-28 11:49:25 -07:00 |
|
Scott Main
|
5bd6794468
|
am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
* commit '5fbe17fe2a5804a613c3e9d72d555a0aae8ba618':
update eclipse download URL; /mobile URL will be deprecated
|
2013-05-28 11:45:25 -07:00 |
|
Scott Main
|
5fbe17fe2a
|
am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
* commit '27ab718e7ca00092acab7f55fed1a5dea9a7a77b':
update eclipse download URL; /mobile URL will be deprecated
|
2013-05-28 11:43:50 -07:00 |
|
Scott Main
|
27ab718e7c
|
Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
|
2013-05-28 18:41:37 +00:00 |
|
Joe Malin
|
ba0256fdc5
|
Docs bug fix: B9085293 - Stop Location Updates
Change-Id: I8dd9e6ca59bac628ba834a86f50783170964e652
|
2013-05-28 10:50:58 -07:00 |
|
John Spurlock
|
be7a7e546f
|
am ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev
* commit 'ee352cca1f3beb577dfdf1c18a08242e4f94d01b':
Fix typo in View.java javadocs
|
2013-05-28 09:36:19 -07:00 |
|
John Spurlock
|
ee352cca1f
|
Merge "Fix typo in View.java javadocs" into jb-mr2-dev
|
2013-05-28 16:33:49 +00:00 |
|
Scott Main
|
1a4022c8a6
|
am 0e11e8ef: am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit '0e11e8ef4bb6472b8e8a1b4b76b4b7c195aaffe1':
docs: SDK and ADT r22.0.1 Release Notes
|
2013-05-28 09:08:02 -07:00 |
|
Scott Main
|
0e11e8ef4b
|
am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit '6e5ee7ddf2cc948ef3b69a73f25ce81f7edd76e9':
docs: SDK and ADT r22.0.1 Release Notes
|
2013-05-28 09:03:37 -07:00 |
|
Scott Main
|
a0ac0f15cd
|
am 597a8374: am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit '597a8374491ffb9dc5c07fadfccd9c1b1b336046':
update GPS setup page to include emulator support. revise the doc layout with headings
|
2013-05-28 09:01:10 -07:00 |
|
Scott Main
|
6e5ee7ddf2
|
am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit 'ea32597832aada5f811c9ca1c1baf008d62ab64a':
docs: SDK and ADT r22.0.1 Release Notes
|
2013-05-28 09:00:51 -07:00 |
|
Scott Main
|
597a837449
|
am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit 'afaff6e2e90e61df52737fec9e059b05cfa71e48':
update GPS setup page to include emulator support. revise the doc layout with headings
|
2013-05-28 08:59:09 -07:00 |
|
Scott Main
|
ea32597832
|
am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit '005d2afb308f474352ec4b504cf661851e4c2e59':
docs: SDK and ADT r22.0.1 Release Notes
|
2013-05-28 08:58:18 -07:00 |
|
Scott Main
|
afaff6e2e9
|
am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit 'fb22f9cb04d13fb85f1b3fd0e979742b5ab6568d':
update GPS setup page to include emulator support. revise the doc layout with headings
|
2013-05-28 08:57:27 -07:00 |
|
Scott Main
|
005d2afb30
|
Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
|
2013-05-28 15:56:24 +00:00 |
|
Scott Main
|
fb22f9cb04
|
am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit '5d64a1932d6c94628442b811c4be7bc41f0f1a8f':
update GPS setup page to include emulator support. revise the doc layout with headings
|
2013-05-28 08:54:59 -07:00 |
|
Scott Main
|
5d64a1932d
|
Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
|
2013-05-28 15:53:04 +00:00 |
|
Scott Main
|
5215f43992
|
am 0b92682d: am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1
* commit '0b92682d292acd830ac84467178ff417cbb3e699':
new android studio download v0.1.1
|
2013-05-28 08:44:23 -07:00 |
|
Scott Main
|
0b92682d29
|
am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1
* commit '43fa2b8853ea61a2bbb1a34cf98c558c4ca830da':
new android studio download v0.1.1
|
2013-05-28 08:42:24 -07:00 |
|
John Spurlock
|
44b1edd948
|
Fix typo in View.java javadocs
Change-Id: I85b9b2bd30d1f9d38954c31f24a352930a230ced
|
2013-05-28 11:40:58 -04:00 |
|
Scott Main
|
43fa2b8853
|
am 718011ac: am d4b710c6: new android studio download v0.1.1
* commit '718011ac851dcd8925ebeaf4f5516b7b1b62a647':
new android studio download v0.1.1
|
2013-05-28 08:39:42 -07:00 |
|
Scott Main
|
718011ac85
|
am d4b710c6: new android studio download v0.1.1
* commit 'd4b710c69800acd0a9237a64e73d62ac9ba3a517':
new android studio download v0.1.1
|
2013-05-28 08:37:35 -07:00 |
|
The Android Open Source Project
|
a503315865
|
Reconcile with jb-mr2-release - do not merge
Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66
|
2013-05-28 07:37:29 -07:00 |
|
Baligh Uddin
|
451b69eee5
|
Import translations. DO NOT MERGE
Change-Id: I99c1563b2e8d99075b09492c163c4a28e229734d
Auto-generated-cl: translation import
|
2013-05-27 09:55:15 -07:00 |
|
Andrew Hsieh
|
c01e1ed688
|
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
See b.android.com/55873
Change-Id: Idff7b71480991e16f57e55748fafa57d5827b10b
|
2013-05-27 12:27:10 +08:00 |
|
Matthew Xie
|
e7e6bf9f02
|
am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
* commit '27e453617a2c179580a55d6cbe0619fa95adf693':
Revert "Change GATT_FAILURE from 0 to 0x101"
|
2013-05-26 14:40:14 -07:00 |
|
Matthew Xie
|
27e453617a
|
Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
|
2013-05-26 21:38:01 +00:00 |
|
Matthew Xie
|
d21f674c15
|
Revert "Change GATT_FAILURE from 0 to 0x101"
This reverts commit 8310e6196ffeb6d0dce33fc1a528113b04f304d6
Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
|
2013-05-26 21:03:16 +00:00 |
|
Matthew Xie
|
84e1afcccc
|
am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
* commit '413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
Change GATT_FAILURE from 0 to 0x101
|
2013-05-26 13:21:44 -07:00 |
|
Matthew Xie
|
413f629300
|
Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
|
2013-05-26 20:19:06 +00:00 |
|
The Android Automerger
|
f062b2a5d0
|
merge in jb-mr2-release history after reset to jb-mr2-dev
|
2013-05-26 05:55:27 -07:00 |
|
Dianne Hackborn
|
66e596e788
|
am 840f1143: am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '840f114395652b3d31815ae23302218305b8b780':
Fix wrong log information in DevicePolicyManagerService
|
2013-05-26 00:25:11 -07:00 |
|
Dianne Hackborn
|
840f114395
|
am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '7f3ff133c19ed50dd245e025a44e1de7bcc3d38a':
Fix wrong log information in DevicePolicyManagerService
|
2013-05-26 00:23:28 -07:00 |
|
Dianne Hackborn
|
7f3ff133c1
|
Merge "Fix wrong log information in DevicePolicyManagerService"
|
2013-05-26 07:22:21 +00:00 |
|
Dianne Hackborn
|
23b07d5549
|
am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit '43861f9de965593340f6a63c270120a7f1a8701c':
Avoid IllegalArgumentException in Preference.java compareTo()
|
2013-05-26 00:05:08 -07:00 |
|
Dianne Hackborn
|
4e73e8a817
|
am 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '95b79966934864f1e81329de92562ee387ff5700':
Fix CalendarView to show the month title properly.
|
2013-05-26 00:05:05 -07:00 |
|
Dianne Hackborn
|
89eed12559
|
am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit 'c73220050efa7420974850ee9a80a965d807c7ce':
Don't include flags in configuration change if their value hasn't changed.
|
2013-05-26 00:05:02 -07:00 |
|
Dianne Hackborn
|
959b9b39b4
|
am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit 'fc09b326da5e35786530777f01cd132d7686a788':
Fix documentation of requestCode parameter.
|
2013-05-26 00:04:59 -07:00 |
|
Dianne Hackborn
|
d031f9c7b7
|
am 087384b0: am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit '087384b0af6fd3912a3d3e32b9ade7e4604e6537':
Framework/base: Added synchronization block to avoid race condition
|
2013-05-26 00:04:57 -07:00 |
|
Dianne Hackborn
|
43861f9de9
|
am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit 'f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
Avoid IllegalArgumentException in Preference.java compareTo()
|
2013-05-26 00:02:46 -07:00 |
|
Dianne Hackborn
|
95b7996693
|
am 0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '0a40bef955c937189841b6f1695e8001311758fa':
Fix CalendarView to show the month title properly.
|
2013-05-26 00:02:41 -07:00 |
|
Dianne Hackborn
|
c73220050e
|
am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit 'f9b41efe17718a21df115d95c47a94d97a767076':
Don't include flags in configuration change if their value hasn't changed.
|
2013-05-26 00:02:37 -07:00 |
|
Dianne Hackborn
|
fc09b326da
|
am fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit 'fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
Fix documentation of requestCode parameter.
|
2013-05-26 00:02:31 -07:00 |
|
Dianne Hackborn
|
087384b0af
|
am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13':
Framework/base: Added synchronization block to avoid race condition
|
2013-05-26 00:02:24 -07:00 |
|
Dianne Hackborn
|
f46449abed
|
Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
|
2013-05-26 06:59:30 +00:00 |
|
Dianne Hackborn
|
0a40bef955
|
Merge "Fix CalendarView to show the month title properly."
|
2013-05-26 06:58:14 +00:00 |
|
Dianne Hackborn
|
f9b41efe17
|
Merge "Don't include flags in configuration change if their value hasn't changed."
|
2013-05-26 06:57:05 +00:00 |
|
Dianne Hackborn
|
fee6d0cb1e
|
Merge "Fix documentation of requestCode parameter."
|
2013-05-26 06:56:03 +00:00 |
|
Dianne Hackborn
|
f325103356
|
Merge "Framework/base: Added synchronization block to avoid race condition"
|
2013-05-26 06:30:26 +00:00 |
|