OSDN Git Service
Lajos Molnar [Wed, 29 May 2013 22:25:35 +0000 (15:25 -0700)]
am
fabd32c1: am
673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev
* commit '
fabd32c1fb353c4e1437f1472de5ec2810bda329':
android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
Dirk Dougherty [Wed, 29 May 2013 22:25:32 +0000 (15:25 -0700)]
am
2bf15756: am
91ea7882: am
f64588a2: am
de8ac602: am
963e3ec5: am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
2bf15756cc416644a4777d76a94947bee75d8b3b':
Doc change: adjust description of NEW_OUTGOING_CALL.
Santos Cordon [Wed, 29 May 2013 22:25:30 +0000 (15:25 -0700)]
am
26e20713: am
828a77ad: am
57f0de12: am
d8754689: am
c72949c6: am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
26e20713f17fa165c3f78277babeffeaeda5e652':
Update documentation of NEW_OUTGOING_CALL
Dianne Hackborn [Wed, 29 May 2013 22:25:27 +0000 (15:25 -0700)]
am
57d436d4: (-s ours) am
8d25fba8: Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev
* commit '
57d436d4dec99fb3a73815040b40fe447c9f1a61':
DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition
Lajos Molnar [Wed, 29 May 2013 22:18:48 +0000 (15:18 -0700)]
am
673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev
* commit '
673903a2759067b29bed7e309211000d365e0ad3':
android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
Dirk Dougherty [Wed, 29 May 2013 22:18:45 +0000 (15:18 -0700)]
am
91ea7882: am
f64588a2: am
de8ac602: am
963e3ec5: am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
91ea7882cdba6bef7918fcd4ff645a9693fdc861':
Doc change: adjust description of NEW_OUTGOING_CALL.
Santos Cordon [Wed, 29 May 2013 22:18:43 +0000 (15:18 -0700)]
am
828a77ad: am
57f0de12: am
d8754689: am
c72949c6: am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
828a77adf8845984189e88394ee9f12577aa063a':
Update documentation of NEW_OUTGOING_CALL
Dianne Hackborn [Wed, 29 May 2013 22:18:40 +0000 (15:18 -0700)]
am
8d25fba8: Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev
* commit '
8d25fba83872b1806c6c21569fce7c87b50257df':
DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition
Svetoslav [Wed, 29 May 2013 22:08:56 +0000 (22:08 +0000)]
Merge "Remove Auto-rotate screen setting if a required feature is missing."
John Spurlock [Wed, 29 May 2013 13:30:50 +0000 (09:30 -0400)]
Docfix: remove confusing "disabled" link label.
Change-Id: I96ebc44fe69de60e187f200b5e9d0b5adc478c17
Lajos Molnar [Wed, 29 May 2013 19:11:02 +0000 (19:11 +0000)]
Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev
Lajos Molnar [Tue, 28 May 2013 20:59:33 +0000 (13:59 -0700)]
android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead,
MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has
the same value.
Remove this now, so that users will not have to translate
MediaCodec flags to MediaMuxer flags, even though MediaMuxer
takes in MediaCodec.BufferInfo objects to specify these flags.
Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9169479
Jason Sams [Wed, 29 May 2013 18:53:13 +0000 (11:53 -0700)]
Fix ambiguous clamp.
Change-Id: I75a55bbfe6b8ef68242c8ecd0f70ef218829d110
Dirk Dougherty [Wed, 29 May 2013 18:42:03 +0000 (11:42 -0700)]
am
f64588a2: am
de8ac602: am
963e3ec5: am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
f64588a2ce6a0e4e76d7d48c47f82785553b13f3':
Doc change: adjust description of NEW_OUTGOING_CALL.
Santos Cordon [Wed, 29 May 2013 18:41:50 +0000 (11:41 -0700)]
am
57f0de12: am
d8754689: am
c72949c6: am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
57f0de12912c7412820b74e119c4a5e3ad2bc203':
Update documentation of NEW_OUTGOING_CALL
Dianne Hackborn [Wed, 29 May 2013 18:25:30 +0000 (18:25 +0000)]
Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev
The Android Open Source Project [Wed, 29 May 2013 15:10:35 +0000 (08:10 -0700)]
am
452b488c: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
452b488c51d99c20ce485207719aabe62419591f':
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
John Spurlock [Wed, 29 May 2013 13:21:23 +0000 (13:21 +0000)]
Merge "Clear low profile bit when showing hideybars."
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
Dave Burke [Wed, 29 May 2013 05:59:24 +0000 (22:59 -0700)]
am
17486b97: am
ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev
* commit '
17486b974940e7f129e74d89b7f8fb0473115943':
Fix up device sounds.
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:30:10 +0000 (22:30 -0700)]
am
897d98a7: am
6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
* commit '
897d98a7530109bff8d73b3651d8884c76f54c42':
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
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
Dirk Dougherty [Wed, 29 May 2013 05:23:11 +0000 (22:23 -0700)]
am
de8ac602: am
963e3ec5: am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
de8ac602e3d74dbcb87dfc4c1cc54fb0553e5f17':
Doc change: adjust description of NEW_OUTGOING_CALL.
Dirk Dougherty [Wed, 29 May 2013 05:21:09 +0000 (22:21 -0700)]
am
963e3ec5: am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
963e3ec55f2ecbb132a627c8d0f6c19d83bc60b8':
Doc change: adjust description of NEW_OUTGOING_CALL.
Dirk Dougherty [Wed, 29 May 2013 05:18:59 +0000 (22:18 -0700)]
am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
71d1af4a7308eeed249bf9b54549311fb781669f':
Doc change: adjust description of NEW_OUTGOING_CALL.
Santos Cordon [Wed, 29 May 2013 05:18:48 +0000 (22:18 -0700)]
am
d8754689: am
c72949c6: am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
d8754689595ab4b5e4e43a89178080d344374869':
Update documentation of NEW_OUTGOING_CALL
Dirk Dougherty [Wed, 29 May 2013 05:17:52 +0000 (22:17 -0700)]
am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
a284e2013af9624f0093d58ea8d14994c8eda316':
Doc change: adjust description of NEW_OUTGOING_CALL.
Santos Cordon [Wed, 29 May 2013 05:16:51 +0000 (22:16 -0700)]
am
c72949c6: am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
c72949c6bc6f5654f09482309d9d3ac03aadd67d':
Update documentation of NEW_OUTGOING_CALL
Dirk Dougherty [Wed, 29 May 2013 05:16:00 +0000 (05:16 +0000)]
Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
Santos Cordon [Wed, 29 May 2013 05:15:39 +0000 (22:15 -0700)]
am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
7999c22867c75f39214d8fa6d99ae61ec8aacc7a':
Update documentation of NEW_OUTGOING_CALL
Santos Cordon [Wed, 29 May 2013 05:14:28 +0000 (22:14 -0700)]
am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
7fb15ce74bbc06c88660440f84845a1f3108c3d3':
Update documentation of NEW_OUTGOING_CALL
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:40:29 +0000 (21:40 -0700)]
am
a1f49d8b: am
295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev
* commit '
a1f49d8bb77db20617f9ea372ad9f1a9e06deece':
Don't show emergency calls label unless it's a phone.
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:25:44 +0000 (21:25 -0700)]
am
466ceb46: am
aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
* commit '
466ceb463f44f72bdd73764e50dcb34c174a0cfe':
Ignore outstanding delayed shutdown on restart
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:47:19 +0000 (20:47 -0700)]
am
e3425ac4: (-s ours) am
af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
e3425ac426fa5da15fa3d8471dd9c0e27cb52375':
Import translations. DO NOT MERGE
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:43:49 +0000 (03:43 +0000)]
Merge "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
Baligh Uddin [Wed, 29 May 2013 03:41:57 +0000 (03:41 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Dianne Hackborn [Wed, 29 May 2013 01:20:57 +0000 (01:20 +0000)]
Merge "Add more details about why a force stop is happening."
Dirk Dougherty [Wed, 29 May 2013 00:37:12 +0000 (17:37 -0700)]
Doc change: adjust description of NEW_OUTGOING_CALL.
Change-Id: If2bcfa7410759e08958029578a9b3d0a60a1de4e
Dianne Hackborn [Wed, 29 May 2013 00:46:59 +0000 (17:46 -0700)]
Add more details about why a force stop is happening.
Change-Id: Ia938cf6fc37ad22fc7447dc538968c7bd234be7d
Andrew Hsieh [Wed, 29 May 2013 00:12:20 +0000 (17:12 -0700)]
am
222ff39f: am
64b5f7cc: am
09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '
222ff39fe2ead6f7fa8f6e6e98082542ad675548':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
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"
Andreas Huber [Tue, 28 May 2013 23:06:30 +0000 (23:06 +0000)]
Merge "Fix parsing of global:http_proxy value."
Santos Cordon [Fri, 17 May 2013 21:48:54 +0000 (14:48 -0700)]
Update documentation of NEW_OUTGOING_CALL
Adds call-handling as a use case for NEW_OUTGOING_CALL
Change-Id: Ie511438bd8d9aa245881f050d32221c81e898745
Jeff Sharkey [Tue, 28 May 2013 22:52:25 +0000 (15:52 -0700)]
am
2c4b0905: am
ab4a0541: am
e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
* commit '
2c4b0905513b73c9e0435632cbaa00320480a857':
Add missing ACTION_MEDIA_UNMOUNTED intent
Jeff Brown [Tue, 28 May 2013 22:52:22 +0000 (15:52 -0700)]
am
c8a77735: am
dea6e86d: am
3422ceb6: Merge "Bug fix for building the hover target list"
* commit '
c8a777356267803be3e235b2fdaf807166fb46eb':
Bug fix for building the hover target list
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 Brown [Tue, 28 May 2013 22:48:47 +0000 (15:48 -0700)]
am
ef0c3e26: am
c8c82009: resolved conflicts for merge of
7573e594 to stage-aosp-master
* commit '
ef0c3e269f15200a3a1111ce9f80516b2d38590a':
Properly rotate full [-pi, +pi] orientation range if available
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
John Spurlock [Tue, 28 May 2013 22:23:16 +0000 (22:23 +0000)]
Merge "Hideybars feature confirmation toast bar."
Andreas Huber [Tue, 28 May 2013 22:17:37 +0000 (15:17 -0700)]
Fix parsing of global:http_proxy value.
This caused a runtime restart for ':' and did not disable the proxy for ""
before.
Change-Id: Ib88b21e9eba5818a4968ae604abad8a3b3d1766f
Romain Guy [Tue, 28 May 2013 22:01:19 +0000 (22:01 +0000)]
Merge "Re-initialize the 9patch cache if cleared with onTrimMemory"
Romain Guy [Tue, 28 May 2013 21:25:09 +0000 (14:25 -0700)]
Re-initialize the 9patch cache if cleared with onTrimMemory
The 9aptch cache was reinitialized after destroying/recreating
the EGL context but not after clearing it during a normal
memory trim.
Change-Id: If6155bfc8a62439e9878bc742a4766b3bd6c6aec
Chris Craik [Tue, 28 May 2013 21:31:54 +0000 (21:31 +0000)]
Merge "Support larger bitmaps in BitmapFactory.Options.inBitmap"
Jeff Brown [Tue, 28 May 2013 20:51:01 +0000 (13:51 -0700)]
am
dcb8d876: am
79df1e65: am
e2a281ca: Merge "Add additional Method that check whether a table is empty or not"
* commit '
dcb8d876581f9bf77e51c5539ef68993870264d8':
Add additional Method that check whether a table is empty or not
Scott Main [Tue, 28 May 2013 20:50:57 +0000 (13:50 -0700)]
am
2ee100c0: 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 '
2ee100c0999e15d11ad36f387a22d9500eb14a6f':
update eclipse download URL; /mobile URL will be deprecated
John Spurlock [Tue, 28 May 2013 20:50:36 +0000 (13:50 -0700)]
am
be7a7e54: am
ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev
* commit '
be7a7e546f409442c2f6505dd7a0526553fa395c':
Fix typo in View.java javadocs
Chris Craik [Tue, 21 May 2013 01:13:47 +0000 (18:13 -0700)]
Support larger bitmaps in BitmapFactory.Options.inBitmap
bug:
8121994
Adds a new distiction between bitmap size and the allocation
(pixel ref/buffer) used to store its data.
BitmapFactory.inBitmap will allow a bitmap to be reinitialized with
new data if the bitmap being decoded is (after sampleSize) equal or
smaller.
Change-Id: I747750a735c858882df3af74fca6cdc46f2a9f81
Scott Main [Tue, 28 May 2013 20:50:32 +0000 (13:50 -0700)]
am
1a4022c8: 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 '
1a4022c8a625436e00fb3174b287c33dd85a45be':
docs: SDK and ADT r22.0.1 Release Notes
Scott Main [Tue, 28 May 2013 20:50:28 +0000 (13:50 -0700)]
am
a0ac0f15: 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 '
a0ac0f15cd8c8ed3a61cd41ce932dd3c860ce0e5':
update GPS setup page to include emulator support. revise the doc layout with headings
Scott Main [Tue, 28 May 2013 20:50:25 +0000 (13:50 -0700)]
am
5215f439: am
0b92682d: am
43fa2b88: am
718011ac: am
d4b710c6: new android studio download v0.1.1
* commit '
5215f4399253d7444d094343429ce6277864f7a7':
new android studio download v0.1.1
The Android Open Source Project [Tue, 28 May 2013 20:50:22 +0000 (13:50 -0700)]
am
a5033158: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a503315865507129e93efe15b281dd0ba98e6da3':
Matthew Xie [Tue, 28 May 2013 20:50:13 +0000 (13:50 -0700)]
am
e7e6bf9f: am
27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
* commit '
e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086':
Revert "Change GATT_FAILURE from 0 to 0x101"
Matthew Xie [Tue, 28 May 2013 20:50:09 +0000 (13:50 -0700)]
am
84e1afcc: am
413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
* commit '
84e1afcccc328e7a52bfde16e824a3ed37889d1d':
Change GATT_FAILURE from 0 to 0x101
Dianne Hackborn [Tue, 28 May 2013 20:50:05 +0000 (13:50 -0700)]
am
66e596e7: am
840f1143: am
7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '
66e596e788761e1168805304d2f5fc93c1f2fbcd':
Fix wrong log information in DevicePolicyManagerService
Dianne Hackborn [Tue, 28 May 2013 20:50:02 +0000 (13:50 -0700)]
am
23b07d55: am
43861f9d: am
f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit '
23b07d5549bf38cfea388b439ac519670be6e7e2':
Avoid IllegalArgumentException in Preference.java compareTo()
Dianne Hackborn [Tue, 28 May 2013 20:49:59 +0000 (13:49 -0700)]
am
4e73e8a8: am
95b79966: am
0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '
4e73e8a817ff99a19ba9ed6fa68754007731406d':
Fix CalendarView to show the month title properly.
Dianne Hackborn [Tue, 28 May 2013 20:49:56 +0000 (13:49 -0700)]
am
89eed125: am
c7322005: am
f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit '
89eed125590c6286fa64e9074e95196c8cc4bd27':
Don't include flags in configuration change if their value hasn't changed.
Dianne Hackborn [Tue, 28 May 2013 20:49:53 +0000 (13:49 -0700)]
am
959b9b39: am
fc09b326: am
fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit '
959b9b39b4e488b643919fb7a58f2fbbdd70e573':
Fix documentation of requestCode parameter.
Dianne Hackborn [Tue, 28 May 2013 20:49:50 +0000 (13:49 -0700)]
am
d031f9c7: (-s ours) am
087384b0: am
f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit '
d031f9c7b7f9b28021abe32b0e0be2033dbec0ae':
Framework/base: Added synchronization block to avoid race condition
Maunik Shah [Thu, 15 Nov 2012 08:37:54 +0000 (14:07 +0530)]
DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition
Fix for the synchronization issue leading to access of an array
Index out of bounds. Issue occurs due to race condition between
removing the activities of a crashed process from history stack
and resuming a separate activity.
Change-Id: I14bb5834e778c15b674248e46fe93b0ce9f37967
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"
John Spurlock [Tue, 28 May 2013 18:58:50 +0000 (14:58 -0400)]
Clear low profile bit when showing hideybars.
Consider this an interaction, ensures that the hideybar
does not reveal itself in low profile mode.
Bug:
9102473
Change-Id: I8819a7d3d7aef0e08afb6f8c574c0ac519066cca
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
OSDN Git Service
