OSDN Git Service
SangWook Han [Sun, 12 Aug 2012 10:46:51 +0000 (19:46 +0900)]
Update preloaded-classes for JB
Change-Id: Id127308529d581c94bd2e911b637931156ce82c1
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:04:05 +0000 (09:04 -0700)]
Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:03:41 +0000 (09:03 -0700)]
Merge "MtpStorage: correct the size of reserve space for MTP"
Wink Saville [Wed, 8 Aug 2012 23:36:34 +0000 (16:36 -0700)]
Merge "Telephony: Dynamically instantiate IccCard"
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:20:07 +0000 (13:20 -0700)]
Merge "Return early when checking divider before child zero."
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:19:59 +0000 (13:19 -0700)]
Merge "Fix SurfaceView notifies on invalid surfaces."
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:17:25 +0000 (13:17 -0700)]
Merge "Add shortcut to avoid potential divide by zero in some case"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:59:05 +0000 (12:59 -0700)]
Merge "Fix wrong count return for getPhoneSignalStrengthCount"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:06:26 +0000 (12:06 -0700)]
Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:06:02 +0000 (12:06 -0700)]
Merge "mediacodec: Don't suggest calling getOutputFormat() immediately"
Jean-Baptiste Queru [Wed, 8 Aug 2012 18:21:28 +0000 (11:21 -0700)]
Merge "Normalize output from aapt d xmltree"
Jean-Baptiste Queru [Wed, 8 Aug 2012 17:44:50 +0000 (10:44 -0700)]
Merge "Fix cursor memory leak"
Jean-Baptiste Queru [Wed, 8 Aug 2012 17:43:20 +0000 (10:43 -0700)]
Merge "Adds missing Bluetooth as network type."
Alex Yakavenka [Wed, 8 Aug 2012 17:30:11 +0000 (10:30 -0700)]
Telephony: Dynamically instantiate IccCard
Add required constant for Dct
Change-Id: I61cafee25cb40fe7de606a78566f93dfee523c73
Elliott Hughes [Tue, 7 Aug 2012 19:19:22 +0000 (12:19 -0700)]
Merge "Fewer warnings in aidl generated code."
Elliott Hughes [Tue, 7 Aug 2012 17:34:02 +0000 (10:34 -0700)]
Fewer warnings in aidl generated code.
Bug: http://code.google.com/p/android/issues/detail?id=19196
Change-Id: If054e60c19dc73fe32f55d0fa1054309565a6de6
bo huang [Mon, 6 Aug 2012 05:16:57 +0000 (13:16 +0800)]
MtpStorage: correct the size of reserve space for MTP
According to description in frameworks/base/core/res/res/xml/storage_list.xml,
"mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage".
Mtpstorage class use it directly and doesn't change it to correct size in megabyes.
Mtp initor can not get correct storage information from android.
Change-Id: Icf59eb1eb478e67ea5990be96a9decb41aa55504
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
Signed-off-by: Jack Ren<jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Chuanxia Dong [Tue, 29 May 2012 04:28:24 +0000 (12:28 +0800)]
StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test.
Issue description:
When run ICS stress test, always meet GREF issue. one of contributor is MountService$MountServiceBinderListener.
log info
19:21:11.609 222 24316 W dalvikvm: 24 of com.android.server.am.ActivityManagerService$AppDeathRecipient (24 unique instances)
19:21:11.609 222 24316 W dalvikvm: 479 of com.android.server.MountService$MountServiceBinderListener (479 unique instances)
19:21:11.619 222 24316 W dalvikvm: 7 of com.android.server.accessibility.AccessibilityManagerService$6 (7 unique instances)
Note: PID 222 is system server.
Issue alaysis:
Everyone can call getSystemService(Context.STORAGE_SERVICE) to get service.
When other service get StorageManager, StorageManager will new MountServiceBinderLister and
register a listener in MountService, which won't be unregistered. It's easy to generate a lot of
instance of unused MountService$MountServiceBinderListener in system server.
Issue fix:
So change the policy to be:
1. Doesn't new MountServiceBinderLister in construction.
2. when other service needs to register listener in StorageManager,
StorageManager will register listener with MountService.
3. When other service needs to unregister listener in StorageManager,
if there is no more other listeners in StorageManager, StorageManager
will unregister listener in MountService.
Change-Id: Iaaf889f44a1a5f62b9f65b3ab1b486c9b7dcaf7f
Author: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Wink Saville [Sat, 4 Aug 2012 14:54:35 +0000 (07:54 -0700)]
Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
Wink Saville [Sat, 4 Aug 2012 14:51:26 +0000 (07:51 -0700)]
Merge "show 3G icon for CDMA/1xRTT"
Alex Yakavenka [Fri, 3 Aug 2012 17:42:41 +0000 (10:42 -0700)]
Telephony: Move AdnRecord.aidl into opt/telephony
Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
Madan Ankapura [Fri, 3 Aug 2012 02:10:22 +0000 (19:10 -0700)]
show 3G icon for CDMA/1xRTT
when config_showMin3G is enabled to true in a CDMA device
Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
Brian Carlstrom [Wed, 1 Aug 2012 23:30:53 +0000 (16:30 -0700)]
Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"
Brian Carlstrom [Tue, 31 Jul 2012 01:44:29 +0000 (18:44 -0700)]
Change KeyStore to use Modified UTF-8 to match NativeCrypto
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug:
6869713
Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
Brian Carlstrom [Wed, 1 Aug 2012 22:06:35 +0000 (15:06 -0700)]
Merge "Improve test key names to reproduce public issue"
Robert Greenwalt [Wed, 1 Aug 2012 18:01:21 +0000 (11:01 -0700)]
Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"
Adam Powell [Mon, 30 Jul 2012 17:46:11 +0000 (10:46 -0700)]
Merge " Fix preload classname for phone policy."
Andreas Röhl [Mon, 2 Jul 2012 11:06:26 +0000 (13:06 +0200)]
Fix SurfaceView notifies on invalid surfaces.
SurfaceView notifies registered callbacks on invalid
Surfaces.
Change-Id: Iddc9a5cd073fb73a0e7e9b9ca64ff4fac0777ca7
Jake Wharton [Sun, 29 Jul 2012 04:31:51 +0000 (21:31 -0700)]
Return early when checking divider before child zero.
Previously the `getChildAt` method would be called with an index of -1 which
would lead to an exception being thrown and caught. This is unnecessary since
we know there will never be a divider before the first child. It also avoids
additional object creation since this method can be invoked quite frequently.
Change-Id: Iab44520d5d52f96a829a009cdd1201696edbf9a4
Brian Carlstrom [Wed, 18 Jul 2012 06:40:49 +0000 (23:40 -0700)]
Improve test key names to reproduce public issue
Also fixes other unrelated test failures.
Bug: http://code.google.com/p/android/issues/detail?id=34577
Bug:
6837950
(cherry-picked from
f4019af04a1fc4b16aa5972cbcbba703caa5d78d)
Change-Id: I5b32b5ccac80f04a4d0fd6b21b8caa11e42995a7
Romain Guy [Fri, 27 Jul 2012 20:58:11 +0000 (13:58 -0700)]
Merge "Corrected typo when checking InputStream methods"
Edward Savage-Jones [Tue, 3 May 2011 11:33:20 +0000 (13:33 +0200)]
Corrected typo when checking InputStream methods
Corrected a small typo where Java InputStream methods are
incorrectly checked when creating a JNI InputStream adaptor.
Change-Id: I5f14897e0d5ddceb4b2af6be46769713f0487624
Naveen Kalla [Sat, 31 Mar 2012 17:09:49 +0000 (10:09 -0700)]
Telephony: Add HSPAP to getTcpBufferSizesPropName
When device is camped on HSPAP TCP Buffer sizes need to be configured
properly to support higher data rates. Without this change, default TCP
buffer sizes will be used and throughput will be low.
Change-Id: Ica5884b35851a32e57c82c63b148df5be580ae83
Chen YANG [Wed, 25 Jul 2012 05:27:40 +0000 (13:27 +0800)]
Add shortcut to avoid potential divide by zero in some case
Change-Id: If4b34c95402daf8ebcc28736edfb2012553aa57c
Nick Kralevich [Thu, 19 Jul 2012 23:25:41 +0000 (16:25 -0700)]
Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"
Jake Hamby [Thu, 19 Jul 2012 22:30:02 +0000 (15:30 -0700)]
Merge "Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony"
Naveen Kalla [Wed, 18 Jul 2012 21:51:11 +0000 (14:51 -0700)]
Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony
This test was missed out while migrating telephony to frameworks/opt.
Change-Id: I75d5bfef81352ebb916b3a4b3e482550478b797b
Wink Saville [Tue, 10 Jul 2012 19:37:54 +0000 (12:37 -0700)]
Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.
mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
Catherine Liu [Tue, 17 Jul 2012 19:12:56 +0000 (14:12 -0500)]
Fix wrong count return for getPhoneSignalStrengthCount
Test report for the time spent in each signal strength bin, along
with the number of times that bin was entered showed the result
as Bin=3 Time=
3211926000 Count=0. With a non-zero Time, the Count
value 0 was wrong.
The cause of the problem was that getPhoneSignalStrengthCount() used
mPhoneDataConnectionsTimer, instead of mPhoneSignalStrengthsTimer,
to get the count.
Change-Id: I55ac1125abfcfdc105605d76d1c706ac315b90cc
Elliott Hughes [Mon, 16 Jul 2012 22:40:25 +0000 (15:40 -0700)]
Merge "Don't talk about Froyo as if it's still in the future."
Elliott Hughes [Mon, 16 Jul 2012 22:30:53 +0000 (15:30 -0700)]
Don't talk about Froyo as if it's still in the future.
Change-Id: I40c26a7a27459f7e8dd51c9f03fa860dee3a3a02
Romain Guy [Mon, 16 Jul 2012 07:57:42 +0000 (00:57 -0700)]
Merge "Fix wrong condition."
SeongJae Park [Sat, 14 Jul 2012 05:18:51 +0000 (14:18 +0900)]
Fix wrong condition.
Should check width and height, not width and width.
Change-Id: Ie84d3605b2a7a0f4776adb876608ea92f56817c4
Martin Storsjo [Fri, 13 Jul 2012 09:57:13 +0000 (12:57 +0300)]
mediacodec: Don't suggest calling getOutputFormat() immediately
Calling getOutputFormat() at this point currently crashes in
native code. (After a fix to the native code, this gives an
IllegalStateException instead.)
Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
Qi Wang [Fri, 13 Jul 2012 01:26:03 +0000 (09:26 +0800)]
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
Joshua Brindle [Tue, 10 Jul 2012 14:22:36 +0000 (10:22 -0400)]
s/LOG/ALOG/ in HAVE_SELINUX blocks
The latest push changed LOG(E|V) to ALOG(E|V) but it was not updated in HAVE_SELINUX blocks.
Change-Id: I626588589dd00775ba29f2a256ac29e481598dc3
Signed-off-by: Joshua Brindle <jbrindle@tresys.com>
Håkan3 Johansson [Wed, 8 Feb 2012 20:13:35 +0000 (21:13 +0100)]
Adds missing Bluetooth as network type.
The network connection type for Bluetooth is added so
that it is possible to use Bluetooth as Hotspot during
download from the Internet.
Change-Id: If8e8a3f69821beef742bc91d7a292a091861b48b
Catherine Liu [Mon, 11 Jun 2012 21:38:17 +0000 (16:38 -0500)]
Fix cursor memory leak
In current code, if an application opens a cursor to access a
provider, and doesn't close that cursor, later, when this cursor
is garbage collected, it won't get closed. This will cause a memory
leak in the provider. The leaked memory can only be reclaimed when
the application with the leaked cursor was dead.
The solution is, close the cursor when it's garbage collected.
Change-Id: I786915c46d4672b6b1b37414b3bc1ff8cea2e00b
Shachar Shemesh [Sun, 8 Jul 2012 03:37:48 +0000 (06:37 +0300)]
Normalize output from aapt d xmltree
When using aapt dump xmltree to dump an XML which has a content element with newlines, the output contains a
newline. This makes it very difficult, sometimes impossible, to understand what is part of the content, and
what is the meta-data.
We now pass XML content through the same normalizer used for other tags.
Change-Id: I327321520fac563eb32aecaf796f2473866697fc
Romain Guy [Sat, 7 Jul 2012 06:52:55 +0000 (23:52 -0700)]
am
dc99555d: Merge "Pass SearchView suggestion cursor exception to Log."
* commit '
dc99555d61d50820b398096bb774ee56b2500476':
Pass SearchView suggestion cursor exception to Log.
Romain Guy [Sat, 7 Jul 2012 06:18:18 +0000 (23:18 -0700)]
Merge "Pass SearchView suggestion cursor exception to Log."
Jake Wharton [Sat, 7 Jul 2012 06:15:44 +0000 (23:15 -0700)]
Pass SearchView suggestion cursor exception to Log.
When an error in fetching a column occurs in your suggestions cursor
adapter this will ensure the stacktrace is logged to provide more
context about what failed.
Change-Id: Iafe4918caebb9b0fb712b758b2d3ace329fd2512
Scott Main [Wed, 4 Jul 2012 02:41:56 +0000 (19:41 -0700)]
am
15796e52: Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev
* commit '
15796e52df1626ae27a6a88c6e905fd3b80868c9':
docs: add largeHeap attribute to app manifest doc external issue 33967
Scott Main [Wed, 4 Jul 2012 02:39:26 +0000 (19:39 -0700)]
Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev
Scott Main [Wed, 4 Jul 2012 02:32:42 +0000 (19:32 -0700)]
am
e469e74f: docs: new sitemap text file
* commit '
e469e74fd339efcfe88b56780f4380b0d1dd2ce8':
docs: new sitemap text file
Scott Main [Wed, 4 Jul 2012 02:28:15 +0000 (19:28 -0700)]
docs: new sitemap text file
Change-Id: Ia28407054216997126873bb855d55c9caeeb05b4
Scott Main [Tue, 3 Jul 2012 03:05:54 +0000 (20:05 -0700)]
docs: add largeHeap attribute to app manifest doc
external issue 33967
Change-Id: I69e5d3da78098842c4710708f4d389637dd0fe6b
Scott Main [Wed, 4 Jul 2012 01:15:19 +0000 (18:15 -0700)]
am
fd516987: docs: misc bugs from external tracker
* commit '
fd516987de29a48425da5ee5aace5be40adcc674':
docs: misc bugs from external tracker
Scott Main [Tue, 3 Jul 2012 23:25:52 +0000 (16:25 -0700)]
docs: misc bugs from external tracker
Change-Id: I02d0d82c220401ac3a1ca180e8331a0f6dcd9e50
Scott Main [Wed, 4 Jul 2012 00:39:25 +0000 (17:39 -0700)]
am
099fd80f: docs: add throws notice for isPlaying per external issue 33610
* commit '
099fd80f984b8493de58bdda8ea05563261b0af2':
docs: add throws notice for isPlaying per external issue 33610
Scott Main [Tue, 3 Jul 2012 23:32:11 +0000 (16:32 -0700)]
docs: add throws notice for isPlaying
per external issue 33610
Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
Joe Malin [Tue, 3 Jul 2012 22:15:59 +0000 (15:15 -0700)]
am
4c633ea6: Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev
* commit '
4c633ea6f28711d168f690f7443c9523451bdbab':
DOC CHANGE: AOSP33968 Typo
Joe Malin [Tue, 3 Jul 2012 22:12:46 +0000 (15:12 -0700)]
Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev
Joe Malin [Tue, 3 Jul 2012 21:19:20 +0000 (14:19 -0700)]
DOC CHANGE: AOSP33968 Typo
Change-Id: I05de2666db6074c84caf540658aad96e6a4805d5
Joe Malin [Tue, 3 Jul 2012 21:27:28 +0000 (14:27 -0700)]
am
8d5efa6a: Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev
* commit '
8d5efa6a8c68f53198b35d01ce64857ae1bf7946':
DOC CHANGE: AOSP 33831 - Typo
Joe Malin [Tue, 3 Jul 2012 21:24:26 +0000 (14:24 -0700)]
Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev
Scott Main [Tue, 3 Jul 2012 21:12:27 +0000 (14:12 -0700)]
am
8ab2dfb2: Merge "docs: fix urls on homepage for offline docs" into jb-dev
* commit '
8ab2dfb293133fa0033a1df9bcf7efb926b421d0':
docs: fix urls on homepage for offline docs
The Android Open Source Project [Tue, 3 Jul 2012 21:09:23 +0000 (14:09 -0700)]
Reconcile with jb-release
Change-Id: I2bd087f75ee99d101e38d0e7b62d0aa701283107
Scott Main [Tue, 3 Jul 2012 21:09:17 +0000 (14:09 -0700)]
Merge "docs: fix urls on homepage for offline docs" into jb-dev
Joe Malin [Tue, 3 Jul 2012 20:54:29 +0000 (13:54 -0700)]
DOC CHANGE: AOSP 33831 - Typo
Change-Id: I394fd5394baf9615463533157e06699478460ceb
Scott Main [Tue, 3 Jan 2012 20:06:03 +0000 (12:06 -0800)]
docs: fix urls on homepage for offline docs
Change-Id: Ifa1da094ee6482c7324ec5a8b50d245d505390b9
The Android Automerger [Tue, 3 Jul 2012 19:53:52 +0000 (12:53 -0700)]
merge in jb-release history after reset to jb-dev
Daniel Sandler [Tue, 3 Jul 2012 19:12:35 +0000 (12:12 -0700)]
am
5d0c689b: Merge "Logs to track bug
6765842." into jb-dev
* commit '
5d0c689b9b98be1b9be4d535ddb6f73142fd9b25':
Logs to track bug
6765842.
The Android Open Source Project [Tue, 3 Jul 2012 19:11:48 +0000 (12:11 -0700)]
Reconcile with jb-release
Change-Id: Ic8cef33354ceb00868f939950089574353e76ce3
Daniel Sandler [Tue, 3 Jul 2012 19:10:19 +0000 (12:10 -0700)]
Merge "Logs to track bug
6765842." into jb-dev
Scott Main [Tue, 3 Jul 2012 18:54:11 +0000 (11:54 -0700)]
am
5a883824: Merge "docs: fix document issue 27549" into jb-dev
* commit '
5a883824a2e97e0ccb08b4fe30accde6542f3f39':
docs: fix document issue 27549
Scott Main [Tue, 3 Jul 2012 18:51:30 +0000 (11:51 -0700)]
Merge "docs: fix document issue 27549" into jb-dev
Daniel Sandler [Tue, 3 Jul 2012 18:30:10 +0000 (14:30 -0400)]
Logs to track bug
6765842.
It looks like we can get into a state where the notification
panel gets un-expanded, leaving an unsightly mess where your
status bar should be.
This change adds some additional info to the dumpsys output.
Bug:
6765842
Change-Id: Iecf2480bc7bdf5bb737863c0cbf9ad07d8523c0c
Scott Main [Tue, 3 Jul 2012 05:00:50 +0000 (22:00 -0700)]
am
399df567: docs: various link fixes and other typos from external tracker
* commit '
399df5677bd116a016664a10a0da432da29e829d':
docs: various link fixes and other typos from external tracker
Scott Main [Tue, 3 Jul 2012 04:49:47 +0000 (21:49 -0700)]
docs: fix document issue 27549
Change-Id: I17995fd70978657a46ccfc77fa2ae84c56a05255
Scott Main [Tue, 3 Jul 2012 04:47:20 +0000 (21:47 -0700)]
docs: various link fixes and other typos from external tracker
Change-Id: I2a107f7e16429c0fe80c5e4cb67ecfaf267db301
The Android Automerger [Tue, 3 Jul 2012 01:59:51 +0000 (18:59 -0700)]
merge in jb-release history after reset to jb-dev
satok [Tue, 3 Jul 2012 01:29:58 +0000 (18:29 -0700)]
am
f212878e: Merge "Update spell checking documents Bug:
6334194" into jb-dev
* commit '
f212878e3513b378eac622e5b03b0ac3aee91127':
Update spell checking documents Bug:
6334194
satok [Tue, 3 Jul 2012 01:27:08 +0000 (18:27 -0700)]
Merge "Update spell checking documents Bug:
6334194" into jb-dev
Craig Mautner [Tue, 3 Jul 2012 00:22:40 +0000 (17:22 -0700)]
am
cc935071: Merge "DO NOT MERGE Set force hiding differently" into jb-dev
* commit '
cc93507124855591be40af55a94deeb33d74e719':
DO NOT MERGE Set force hiding differently
Craig Mautner [Tue, 3 Jul 2012 00:20:00 +0000 (17:20 -0700)]
Merge "DO NOT MERGE Set force hiding differently" into jb-dev
Craig Mautner [Tue, 3 Jul 2012 00:05:16 +0000 (17:05 -0700)]
am
00b9e899: Merge "Clear startingDisplayed flag when removing window." into jb-dev
* commit '
00b9e899320488ff5623d8c80258ed7dfefc7b53':
Clear startingDisplayed flag when removing window.
Craig Mautner [Tue, 3 Jul 2012 00:01:58 +0000 (17:01 -0700)]
Merge "Clear startingDisplayed flag when removing window." into jb-dev
Craig Mautner [Mon, 2 Jul 2012 23:21:28 +0000 (16:21 -0700)]
Clear startingDisplayed flag when removing window.
The flag indicating that the Starting window is displayed was not
being cleared when the Starting window was removed. That caused the
goodToGo indication to falsely indicate that all windows were drawn
when in fact the destination activity had not yet been drawn. This
caused the animation to begin when it was still black behind the old
animation.
This fixes bug
6764727.
Change-Id: Iacef73b0335b9bde2cdc8d0b072034222cd728e8
The Android Automerger [Mon, 2 Jul 2012 23:19:23 +0000 (16:19 -0700)]
merge in jb-release history after reset to jb-dev
Dirk Dougherty [Mon, 2 Jul 2012 22:59:26 +0000 (15:59 -0700)]
am
4123b46f: Merge "Doc change: updated numbers for Andriod. Fix gcm image path." into jb-dev
* commit '
4123b46f0e4146cb181b53af476e34bfede7d1ec':
Doc change: updated numbers for Andriod. Fix gcm image path.
Dirk Dougherty [Mon, 2 Jul 2012 22:56:49 +0000 (15:56 -0700)]
Merge "Doc change: updated numbers for Andriod. Fix gcm image path." into jb-dev
Dirk Dougherty [Mon, 2 Jul 2012 22:52:25 +0000 (15:52 -0700)]
Doc change: updated numbers for Andriod. Fix gcm image path.
Change-Id: Ia3b43f9464938b9775ee6f77c850af37fac9117f
Jean-Baptiste Queru [Mon, 2 Jul 2012 21:48:48 +0000 (14:48 -0700)]
Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp
Jean-Baptiste Queru [Mon, 2 Jul 2012 21:48:44 +0000 (14:48 -0700)]
Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp
Jean-Baptiste Queru [Mon, 2 Jul 2012 21:48:38 +0000 (14:48 -0700)]
Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aosp
Jean-Baptiste Queru [Mon, 2 Jul 2012 21:48:33 +0000 (14:48 -0700)]
Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" into jb-dev-plus-aosp
Jean-Baptiste Queru [Mon, 2 Jul 2012 21:48:28 +0000 (14:48 -0700)]
Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp
Jean-Baptiste Queru [Mon, 2 Jul 2012 21:48:19 +0000 (14:48 -0700)]
Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into jb-dev-plus-aosp
Eric Fischer [Mon, 2 Jul 2012 21:09:49 +0000 (14:09 -0700)]
am
c70ec659: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
c70ec659e8f63b31e11f5f0a82c638261d67056e':
Import translations. DO NOT MERGE