OSDN Git Service
Amith Yamasani [Wed, 29 May 2013 22:18:50 +0000 (15:18 -0700)]
am
9b76b2d2: Merge "framework:base: iterator error in singletone provider"
* commit '
9b76b2d29fa338a128f699a1f40f7f5916a512af':
framework:base: iterator error in singletone provider
Amith Yamasani [Wed, 29 May 2013 22:04:01 +0000 (22:04 +0000)]
Merge "framework:base: iterator error in singletone provider"
The Android Open Source Project [Wed, 29 May 2013 15:05:58 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I126272e67629e850e151f5601a03812c4b9b1782
The Android Automerger [Wed, 29 May 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jun Su [Tue, 21 May 2013 09:24:32 +0000 (17:24 +0800)]
framework:base: iterator error in singletone provider
In case of singletone provider, we don't count it in the guset user.
After we remove it from the array, and resize the array, need to move
iterator back.
Change-Id: I99920a6beccc9de0e67ffeb632b1940efaee10b9
Dave Burke [Wed, 29 May 2013 05:57:59 +0000 (22:57 -0700)]
am
ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev
* commit '
ed8f94fc454098889ccc6cf7745447090dc16905':
Fix up device sounds.
Dave Burke [Wed, 29 May 2013 05:56:04 +0000 (05:56 +0000)]
Merge "Fix up device sounds." into jb-mr2-dev
Matthew Xie [Wed, 29 May 2013 05:27:44 +0000 (22:27 -0700)]
am
6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
* commit '
6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
Matthew Xie [Wed, 29 May 2013 05:25:47 +0000 (05:25 +0000)]
Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
Dave Burke [Wed, 29 May 2013 04:44:29 +0000 (21:44 -0700)]
Fix up device sounds.
Bug:
9179812
Change-Id: Ie86287487830c06f38bcc5c0e8bab3da225d6bbf
Daniel Sandler [Wed, 29 May 2013 04:37:59 +0000 (21:37 -0700)]
am
295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev
* commit '
295eddb92fd6e137ae352ea8dace2ecd18bf0a8a':
Don't show emergency calls label unless it's a phone.
Daniel Sandler [Wed, 29 May 2013 04:36:23 +0000 (04:36 +0000)]
Merge "Don't show emergency calls label unless it's a phone." into jb-mr2-dev
Robert Greenwalt [Wed, 29 May 2013 04:23:11 +0000 (21:23 -0700)]
am
aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
* commit '
aa4b2ee0d654b345b727cb47afd246d0b769fafd':
Ignore outstanding delayed shutdown on restart
Robert Greenwalt [Wed, 29 May 2013 04:21:24 +0000 (04:21 +0000)]
Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 03:44:52 +0000 (20:44 -0700)]
am
af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
af1e512e3f2b52e563e37c1635cbea06e87e0592':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 03:42:23 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Robert Greenwalt [Wed, 29 May 2013 02:33:48 +0000 (19:33 -0700)]
Ignore outstanding delayed shutdown on restart
This was causing us to go disabled when we shouldn't
so the API being tested in the CTS would fail. Bug
is timing dependent and hard to repro.
bug:
9067887
Change-Id: I70b813bf826988d859cc29201242238f18dcf2e6
Andrew Hsieh [Wed, 29 May 2013 00:10:02 +0000 (17:10 -0700)]
am
64b5f7cc: am
09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '
64b5f7cc4ca094754d4631ffb801b7bb771081ec':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
Andrew Hsieh [Wed, 29 May 2013 00:08:54 +0000 (17:08 -0700)]
am
09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '
09377ddb93a964b9e0def6d84b8beb3a515f4a18':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
Andrew Hsieh [Wed, 29 May 2013 00:06:54 +0000 (00:06 +0000)]
Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
Jeff Sharkey [Tue, 28 May 2013 22:49:16 +0000 (15:49 -0700)]
am
ab4a0541: am
e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
* commit '
ab4a0541994d5de9520ad4ba37c3a11c5f540eb5':
Add missing ACTION_MEDIA_UNMOUNTED intent
Jeff Brown [Tue, 28 May 2013 22:49:13 +0000 (15:49 -0700)]
am
dea6e86d: am
3422ceb6: Merge "Bug fix for building the hover target list"
* commit '
dea6e86dce716b67fe92c9b281fe9e79256f3b78':
Bug fix for building the hover target list
Jeff Sharkey [Tue, 28 May 2013 22:46:08 +0000 (15:46 -0700)]
am
e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
* commit '
e4c29de9c69d332d65d2eb490961faffab4467fd':
Add missing ACTION_MEDIA_UNMOUNTED intent
Jeff Brown [Tue, 28 May 2013 22:46:00 +0000 (15:46 -0700)]
am
3422ceb6: Merge "Bug fix for building the hover target list"
* commit '
3422ceb6ba453c28ac39dfce34534e0346394a3a':
Bug fix for building the hover target list
Jeff Brown [Tue, 28 May 2013 22:45:43 +0000 (15:45 -0700)]
am
c8c82009: resolved conflicts for merge of
7573e594 to stage-aosp-master
* commit '
c8c82009dc8c146efadac6b51702922148f6003f':
Properly rotate full [-pi, +pi] orientation range if available
Jeff Brown [Tue, 28 May 2013 22:43:16 +0000 (15:43 -0700)]
resolved conflicts for merge of
7573e594 to stage-aosp-master
Change-Id: Ic19294c82ec023707e23b5848901426433b22e9f
Matthew Xie [Tue, 28 May 2013 21:06:50 +0000 (21:06 +0000)]
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
This reverts commit
d21f674c150aa26c8094d1418108649f53f810e6
bug
9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
Jeff Sharkey [Tue, 28 May 2013 20:44:46 +0000 (20:44 +0000)]
Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
Daniel Sandler [Tue, 28 May 2013 20:17:13 +0000 (16:17 -0400)]
Don't show emergency calls label unless it's a phone.
Bug:
9042105
Change-Id: I8ffb6a66851878cdf22be9a20dbf57f5b6b48002
Jeff Brown [Tue, 28 May 2013 20:04:23 +0000 (20:04 +0000)]
Merge "Bug fix for building the hover target list"
Jeff Brown [Tue, 28 May 2013 20:00:28 +0000 (13:00 -0700)]
am
79df1e65: am
e2a281ca: Merge "Add additional Method that check whether a table is empty or not"
* commit '
79df1e65455fdb69f07675cffae99dea06a5afb2':
Add additional Method that check whether a table is empty or not
Jeff Brown [Tue, 28 May 2013 19:57:59 +0000 (12:57 -0700)]
am
e2a281ca: Merge "Add additional Method that check whether a table is empty or not"
* commit '
e2a281ca85f17eaf6d47978c76d2cafb0fa81782':
Add additional Method that check whether a table is empty or not
Jeff Brown [Tue, 28 May 2013 19:56:19 +0000 (19:56 +0000)]
Merge "Properly rotate full [-pi, +pi] orientation range if available"
Jeff Brown [Tue, 28 May 2013 19:55:25 +0000 (19:55 +0000)]
Merge "Add additional Method that check whether a table is empty or not"
Scott Main [Tue, 28 May 2013 18:51:08 +0000 (11:51 -0700)]
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
Scott Main [Tue, 28 May 2013 18:49:25 +0000 (11:49 -0700)]
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
Scott Main [Tue, 28 May 2013 18:45:25 +0000 (11:45 -0700)]
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
Scott Main [Tue, 28 May 2013 18:43:50 +0000 (11:43 -0700)]
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
Scott Main [Tue, 28 May 2013 18:41:37 +0000 (18:41 +0000)]
Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
John Spurlock [Tue, 28 May 2013 16:36:19 +0000 (09:36 -0700)]
am
ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev
* commit '
ee352cca1f3beb577dfdf1c18a08242e4f94d01b':
Fix typo in View.java javadocs
John Spurlock [Tue, 28 May 2013 16:33:49 +0000 (16:33 +0000)]
Merge "Fix typo in View.java javadocs" into jb-mr2-dev
Scott Main [Tue, 28 May 2013 16:08:02 +0000 (09:08 -0700)]
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
Scott Main [Tue, 28 May 2013 16:03:37 +0000 (09:03 -0700)]
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
Scott Main [Tue, 28 May 2013 16:01:10 +0000 (09:01 -0700)]
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
Scott Main [Tue, 28 May 2013 16:00:51 +0000 (09:00 -0700)]
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
Scott Main [Tue, 28 May 2013 15:59:09 +0000 (08:59 -0700)]
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
Scott Main [Tue, 28 May 2013 15:58:18 +0000 (08:58 -0700)]
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
Scott Main [Tue, 28 May 2013 15:57:27 +0000 (08:57 -0700)]
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
Scott Main [Tue, 28 May 2013 15:56:23 +0000 (15:56 +0000)]
Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
Scott Main [Tue, 28 May 2013 15:54:59 +0000 (08:54 -0700)]
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
Scott Main [Tue, 28 May 2013 15:53:04 +0000 (15:53 +0000)]
Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
Scott Main [Tue, 28 May 2013 15:44:23 +0000 (08:44 -0700)]
am
0b92682d: am
43fa2b88: am
718011ac: am
d4b710c6: new android studio download v0.1.1
* commit '
0b92682d292acd830ac84467178ff417cbb3e699':
new android studio download v0.1.1
Scott Main [Tue, 28 May 2013 15:42:24 +0000 (08:42 -0700)]
am
43fa2b88: am
718011ac: am
d4b710c6: new android studio download v0.1.1
* commit '
43fa2b8853ea61a2bbb1a34cf98c558c4ca830da':
new android studio download v0.1.1
John Spurlock [Tue, 28 May 2013 15:40:58 +0000 (11:40 -0400)]
Fix typo in View.java javadocs
Change-Id: I85b9b2bd30d1f9d38954c31f24a352930a230ced
Scott Main [Tue, 28 May 2013 15:39:42 +0000 (08:39 -0700)]
am
718011ac: am
d4b710c6: new android studio download v0.1.1
* commit '
718011ac851dcd8925ebeaf4f5516b7b1b62a647':
new android studio download v0.1.1
Scott Main [Tue, 28 May 2013 15:37:35 +0000 (08:37 -0700)]
am
d4b710c6: new android studio download v0.1.1
* commit '
d4b710c69800acd0a9237a64e73d62ac9ba3a517':
new android studio download v0.1.1
The Android Open Source Project [Tue, 28 May 2013 14:37:29 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66
Baligh Uddin [Mon, 27 May 2013 16:55:15 +0000 (09:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99c1563b2e8d99075b09492c163c4a28e229734d
Auto-generated-cl: translation import
Andrew Hsieh [Mon, 27 May 2013 04:27:10 +0000 (12:27 +0800)]
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
See b.android.com/55873
Change-Id: Idff7b71480991e16f57e55748fafa57d5827b10b
Matthew Xie [Sun, 26 May 2013 21:40:14 +0000 (14:40 -0700)]
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"
Matthew Xie [Sun, 26 May 2013 21:38:01 +0000 (21:38 +0000)]
Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
Matthew Xie [Sun, 26 May 2013 21:03:16 +0000 (21:03 +0000)]
Revert "Change GATT_FAILURE from 0 to 0x101"
This reverts commit
8310e6196ffeb6d0dce33fc1a528113b04f304d6
Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
Matthew Xie [Sun, 26 May 2013 20:21:44 +0000 (13:21 -0700)]
am
413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
* commit '
413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
Change GATT_FAILURE from 0 to 0x101
Matthew Xie [Sun, 26 May 2013 20:19:05 +0000 (20:19 +0000)]
Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
The Android Automerger [Sun, 26 May 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Dianne Hackborn [Sun, 26 May 2013 07:25:11 +0000 (00:25 -0700)]
am
840f1143: am
7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '
840f114395652b3d31815ae23302218305b8b780':
Fix wrong log information in DevicePolicyManagerService
Dianne Hackborn [Sun, 26 May 2013 07:23:28 +0000 (00:23 -0700)]
am
7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '
7f3ff133c19ed50dd245e025a44e1de7bcc3d38a':
Fix wrong log information in DevicePolicyManagerService
Dianne Hackborn [Sun, 26 May 2013 07:22:21 +0000 (07:22 +0000)]
Merge "Fix wrong log information in DevicePolicyManagerService"
Dianne Hackborn [Sun, 26 May 2013 07:05:08 +0000 (00:05 -0700)]
am
43861f9d: am
f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit '
43861f9de965593340f6a63c270120a7f1a8701c':
Avoid IllegalArgumentException in Preference.java compareTo()
Dianne Hackborn [Sun, 26 May 2013 07:05:05 +0000 (00:05 -0700)]
am
95b79966: am
0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '
95b79966934864f1e81329de92562ee387ff5700':
Fix CalendarView to show the month title properly.
Dianne Hackborn [Sun, 26 May 2013 07:05:02 +0000 (00:05 -0700)]
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.
Dianne Hackborn [Sun, 26 May 2013 07:04:59 +0000 (00:04 -0700)]
am
fc09b326: am
fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit '
fc09b326da5e35786530777f01cd132d7686a788':
Fix documentation of requestCode parameter.
Dianne Hackborn [Sun, 26 May 2013 07:04:57 +0000 (00:04 -0700)]
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
Dianne Hackborn [Sun, 26 May 2013 07:02:46 +0000 (00:02 -0700)]
am
f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit '
f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
Avoid IllegalArgumentException in Preference.java compareTo()
Dianne Hackborn [Sun, 26 May 2013 07:02:41 +0000 (00:02 -0700)]
am
0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '
0a40bef955c937189841b6f1695e8001311758fa':
Fix CalendarView to show the month title properly.
Dianne Hackborn [Sun, 26 May 2013 07:02:37 +0000 (00:02 -0700)]
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.
Dianne Hackborn [Sun, 26 May 2013 07:02:31 +0000 (00:02 -0700)]
am
fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit '
fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
Fix documentation of requestCode parameter.
Dianne Hackborn [Sun, 26 May 2013 07:02:24 +0000 (00:02 -0700)]
am
f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit '
f325103356c559d6378da7fb7db3b2a49aba5d13':
Framework/base: Added synchronization block to avoid race condition
Dianne Hackborn [Sun, 26 May 2013 06:59:29 +0000 (06:59 +0000)]
Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
Dianne Hackborn [Sun, 26 May 2013 06:58:14 +0000 (06:58 +0000)]
Merge "Fix CalendarView to show the month title properly."
Dianne Hackborn [Sun, 26 May 2013 06:57:04 +0000 (06:57 +0000)]
Merge "Don't include flags in configuration change if their value hasn't changed."
Dianne Hackborn [Sun, 26 May 2013 06:56:03 +0000 (06:56 +0000)]
Merge "Fix documentation of requestCode parameter."
Dianne Hackborn [Sun, 26 May 2013 06:30:26 +0000 (06:30 +0000)]
Merge "Framework/base: Added synchronization block to avoid race condition"
Yu Shan Emily Lau [Sat, 25 May 2013 01:53:47 +0000 (18:53 -0700)]
am
b830d527: Merge "Update test with CamercorderProfile video size." into jb-mr2-dev
* commit '
b830d527deb75a36aa78367026d6631a9b4e1126':
Update test with CamercorderProfile video size.
Yu Shan Emily Lau [Sat, 25 May 2013 01:51:40 +0000 (01:51 +0000)]
Merge "Update test with CamercorderProfile video size." into jb-mr2-dev
Scott Main [Sat, 25 May 2013 01:18:33 +0000 (18:18 -0700)]
am
4a47f17a: Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev
* commit '
4a47f17a9db8fd2b8b17ad10a629216cc3c6333c':
add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes
Scott Main [Sat, 25 May 2013 01:17:06 +0000 (01:17 +0000)]
Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev
Romain Guy [Sat, 25 May 2013 00:40:40 +0000 (17:40 -0700)]
am
529a9e39: Merge "TransitionDrawable should not become a LayerDrawable Bug #
9057757" into jb-mr2-dev
* commit '
529a9e391e386aac37ea722d2517d376968b3d31':
TransitionDrawable should not become a LayerDrawable Bug #
9057757
Romain Guy [Sat, 25 May 2013 00:38:26 +0000 (00:38 +0000)]
Merge "TransitionDrawable should not become a LayerDrawable Bug #
9057757" into jb-mr2-dev
Romain Guy [Sat, 25 May 2013 00:31:17 +0000 (17:31 -0700)]
TransitionDrawable should not become a LayerDrawable
Bug #
9057757
Calling TransitionDrawable.mutate() would turn it into a LayerDrawable,
causing it to draw all its children on screen at the same time.
Change-Id: I5efa87c43114a9c817719f08890ce41965f3220a
The Android Open Source Project [Fri, 24 May 2013 22:28:19 +0000 (15:28 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917
Scott Main [Fri, 24 May 2013 21:42:58 +0000 (14:42 -0700)]
am
eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it\'s from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev
* commit '
eebec7b1fe68cef9c4feed1f56af2592b402a629':
fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()
Scott Main [Fri, 24 May 2013 21:40:45 +0000 (21:40 +0000)]
Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev
Scott Main [Fri, 24 May 2013 20:36:24 +0000 (13:36 -0700)]
add links to orientation flags in attribute docs
to help determine the supported API level for each value
and update the manifest reference page with new attributes
Change-Id: I583a9b3f3be759be71044533055dec26e3616b72
Alan Viverette [Fri, 24 May 2013 21:21:55 +0000 (14:21 -0700)]
am
14ccf554: Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev
* commit '
14ccf554d0168d94c35c058b057d7d1aca228c6e':
DO NOT MERGE. Fix number picker accessibility focus.
Alan Viverette [Fri, 24 May 2013 21:19:55 +0000 (21:19 +0000)]
Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev
Michael Wright [Fri, 24 May 2013 20:53:47 +0000 (13:53 -0700)]
am
bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev
* commit '
bf0d561c73abd97a1a3794e9aa62b21911279a12':
Pipe through bounding box information (DO NOT MERGE)
Deepanshu Gupta [Fri, 24 May 2013 20:53:44 +0000 (13:53 -0700)]
am
417e512b: Merge "Add missing native methods." into jb-mr2-dev
* commit '
417e512ba1d099583c41bd7595f2124ca77c2aee':
Add missing native methods.
Michael Wright [Fri, 24 May 2013 20:52:40 +0000 (20:52 +0000)]
Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev
Deepanshu Gupta [Fri, 24 May 2013 20:52:07 +0000 (20:52 +0000)]
Merge "Add missing native methods." into jb-mr2-dev
OSDN Git Service
