OSDN Git Service
The Android Automerger [Sun, 6 Nov 2011 14:46:46 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Steven Ross [Sat, 5 Nov 2011 00:38:11 +0000 (17:38 -0700)]
Merge "Using same task fixes
5486287" into ics-mr1
Irfan Sheriff [Fri, 4 Nov 2011 22:48:39 +0000 (22:48 +0000)]
am
01b32368: Add provisioning checks for BT and USB
* commit '
01b32368fffd944a0265f22db764b689179be94c':
Add provisioning checks for BT and USB
Irfan Sheriff [Fri, 4 Nov 2011 19:08:56 +0000 (12:08 -0700)]
Add provisioning checks for BT and USB
Bug:
5568752
Change-Id: Ide4f3c0eb19f8e70e301a13d81b76dd6a0516c3a
The Android Open Source Project [Fri, 4 Nov 2011 14:57:21 +0000 (07:57 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I1b9c07a111d23bd863d4beb0a31a2ab949e9eae7
Steven Ross [Fri, 4 Nov 2011 14:28:32 +0000 (10:28 -0400)]
Using same task fixes
5486287
Change-Id: I8a4cd746bc0a0a8610ef9fe55325049fa3304820
The Android Automerger [Thu, 3 Nov 2011 13:44:50 +0000 (06:44 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 3 Nov 2011 03:58:19 +0000 (20:58 -0700)]
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
This reverts commit
1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to
19d9a3d2846c538502003a81522f6d285b9ff24b.
The Android Automerger [Thu, 3 Nov 2011 03:58:10 +0000 (20:58 -0700)]
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
This reverts commit
19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to
480b2e440646e4859ebdd88b82441b4bd9a61651.
The Android Automerger [Thu, 3 Nov 2011 03:53:25 +0000 (20:53 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
Daniel Sandler [Thu, 3 Nov 2011 03:30:27 +0000 (23:30 -0400)]
Bring back Android Dreams.
Bug:
5121105
Change-Id: I29ddee7e4a83a01844cdb735de14c02dcbf3086c
Eric Fischer [Thu, 3 Nov 2011 00:04:17 +0000 (00:04 +0000)]
am
553a2bda: (-s ours) Import revised translations. DO NOT MERGE
* commit '
553a2bda178d246e99bce744fefa2a5765c6cb04':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Nov 2011 22:19:25 +0000 (15:19 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I845d6b903ad4314b9aa61ea9ee03d7248164330a
The Android Open Source Project [Wed, 2 Nov 2011 17:53:29 +0000 (10:53 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: Iea3f36179ad20263df6dbf71a5f4fefc7a931704
The Android Automerger [Wed, 2 Nov 2011 17:07:45 +0000 (10:07 -0700)]
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
This reverts commit
1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to
19d9a3d2846c538502003a81522f6d285b9ff24b.
The Android Automerger [Wed, 2 Nov 2011 17:07:38 +0000 (10:07 -0700)]
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
This reverts commit
19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to
480b2e440646e4859ebdd88b82441b4bd9a61651.
The Android Automerger [Wed, 2 Nov 2011 16:48:56 +0000 (09:48 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 13:46:51 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 2 Nov 2011 11:41:12 +0000 (04:41 -0700)]
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
This reverts commit
1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to
19d9a3d2846c538502003a81522f6d285b9ff24b.
Irfan Sheriff [Wed, 2 Nov 2011 04:18:13 +0000 (04:18 +0000)]
am
1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0
* commit '
1103c3beb80c522778ae7b925d703e2ac3afd5e3':
Use component details to send provisionig intent
Irfan Sheriff [Wed, 2 Nov 2011 04:15:30 +0000 (21:15 -0700)]
Merge "Use component details to send provisionig intent" into ics-mr0
Irfan Sheriff [Tue, 1 Nov 2011 21:58:31 +0000 (14:58 -0700)]
Use component details to send provisionig intent
Bug:
5544654
Change-Id: I0bd33c2a0d4c657bd10ba966d67ff54c27e42ea1
Eric Fischer [Tue, 1 Nov 2011 20:51:13 +0000 (13:51 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:37:58 +0000 (13:37 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I65499d2eade80a1bb57f7f6fe27018c106554300
The Android Open Source Project [Tue, 1 Nov 2011 17:10:37 +0000 (17:10 +0000)]
am
7d1737e0: Reconcile with ics-factoryrom-2-release
* commit '
7d1737e045ae970049e723c5b3c681860d552ad6':
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
The Android Open Source Project [Tue, 1 Nov 2011 17:08:55 +0000 (10:08 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I744c148cd22781c33cd51cd734a055952f39d648
The Android Automerger [Tue, 1 Nov 2011 13:46:29 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Nick Pelly [Tue, 1 Nov 2011 00:04:08 +0000 (00:04 +0000)]
am
1b4f5d74: Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0
* commit '
1b4f5d743594971eab9747a84ee21420a8602bbe':
Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.
Nick Pelly [Tue, 1 Nov 2011 00:02:15 +0000 (17:02 -0700)]
Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0
The Android Automerger [Mon, 31 Oct 2011 23:47:58 +0000 (16:47 -0700)]
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
This reverts commit
19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to
480b2e440646e4859ebdd88b82441b4bd9a61651.
Nick Pelly [Mon, 31 Oct 2011 21:11:29 +0000 (14:11 -0700)]
Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.
ACTION_NFCSHARING_SETTINGS is a new ICS API that doesn't work until now.
It allows application to show UI to turn Android Beam on.
Add ACTION_NFC_SHARING - exposed in MR2.
Remove ANDROID_BEAM_SETTINGS, this was orphanned.
I wish we had renamed ACTION_NFCSHARING_SETTINGS to ACTION_NDEF_PUSH_SETTINGS,
but too late now. It's already released in SDK.
Bug:
5465097
Change-Id: I641b2efa39a3567cbd1c31587f3b67b1b0a0caa0
Signed-off-by: Nick Pelly <npelly@google.com>
Irfan Sheriff [Mon, 31 Oct 2011 21:03:19 +0000 (21:03 +0000)]
am
19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0
* commit '
19d9a3d2846c538502003a81522f6d285b9ff24b':
Fix WPS pin input UI
Irfan Sheriff [Mon, 31 Oct 2011 21:01:42 +0000 (14:01 -0700)]
Merge "Fix WPS pin input UI" into ics-mr0
Irfan Sheriff [Mon, 31 Oct 2011 20:37:06 +0000 (13:37 -0700)]
Fix WPS pin input UI
Change If60f42f7 introduces a bug for the WPS UI.
The input from access point text box should be shown for KEYPAD input
Bug:
5542833
Change-Id: I27f758b31b69425f51fe7ed17bf9b787a1bf66cc
The Android Automerger [Mon, 31 Oct 2011 13:46:50 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Amith Yamasani [Sun, 30 Oct 2011 21:37:12 +0000 (21:37 +0000)]
am
480b2e44: Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0
* commit '
480b2e440646e4859ebdd88b82441b4bd9a61651':
Use vibrate icon in volume settings when appropriate.
The Android Automerger [Sun, 30 Oct 2011 13:48:02 +0000 (06:48 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Sat, 29 Oct 2011 03:15:30 +0000 (03:15 +0000)]
am
6fded4ab: (-s ours) Import revised translations. DO NOT MERGE
* commit '
6fded4ab3fca2d79a82c40f90370b12489456dff':
Import revised translations. DO NOT MERGE
Amith Yamasani [Sat, 29 Oct 2011 02:40:42 +0000 (19:40 -0700)]
Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0
Amith Yamasani [Sat, 29 Oct 2011 02:22:05 +0000 (19:22 -0700)]
Use vibrate icon in volume settings when appropriate.
Clicking on icon will now put it in vibrate mode (instead of silent)
if vibrate is enabled for silent mode.
Bug:
5530217
Change-Id: Icd314981734af2cb37cf47fe27fc697bf447af73
Eric Fischer [Sat, 29 Oct 2011 00:06:49 +0000 (17:06 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib938444059955eab65a79afef9d9ec3c971dcd8c
Eric Fischer [Fri, 28 Oct 2011 21:01:37 +0000 (14:01 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 20:54:20 +0000 (13:54 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I8a28a888b322b379800fae19299e91a3b485b2f8
Narayan Kamath [Fri, 28 Oct 2011 09:15:38 +0000 (02:15 -0700)]
Merge "Hide the "install voice data" preference by default. DO NOT MERGE" into ics-mr1
Jaikumar Ganesh [Fri, 28 Oct 2011 02:14:06 +0000 (02:14 +0000)]
am
d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0
* commit '
d9bf0d1afa7857ec3f678ac2aa041b42bcf2ef5a':
Fix UI issue with Bluetooth Settings.
Jaikumar Ganesh [Thu, 27 Oct 2011 23:49:39 +0000 (16:49 -0700)]
Merge "Fix UI issue with Bluetooth Settings." into ics-mr0
Jaikumar Ganesh [Thu, 27 Oct 2011 23:23:30 +0000 (16:23 -0700)]
Fix UI issue with Bluetooth Settings.
When a profile fails to connect, the preference was getting unset.
Patch generated in conversation with Jake Hamby.
Bug:
5526404
Change-Id: I27ab8d337b6d121f8d369841d3f9a691293ef922
Eric Fischer [Thu, 27 Oct 2011 21:46:47 +0000 (21:46 +0000)]
am
65c61ef8: (-s ours) Import revised translations. DO NOT MERGE
* commit '
65c61ef8cd6904c4b378cb04dbe564229ff70cd7':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 16:53:19 +0000 (09:53 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I2731df18113b720c7b2894c670302330c9c29f9f
Eric Fischer [Thu, 27 Oct 2011 16:45:59 +0000 (09:45 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Narayan Kamath [Thu, 27 Oct 2011 15:34:50 +0000 (16:34 +0100)]
Hide the "install voice data" preference by default. DO NOT MERGE
Re-added if there are voices to install.
DO NOT MERGE : Was already submitted to master.
bug:
5511343
Change-Id: Iac95f37c3dda3b213f6ba34c32b7dc725673d64d
The Android Automerger [Thu, 27 Oct 2011 13:47:48 +0000 (06:47 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 27 Oct 2011 00:40:52 +0000 (17:40 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I22ad234b19bb6270f7edd9461590d119d7dc4eff
Eric Fischer [Wed, 26 Oct 2011 21:08:59 +0000 (21:08 +0000)]
am
d27fa50a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
d27fa50a0a823403fd77929f8b6a40a260a27577':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 21:06:13 +0000 (14:06 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Wed, 26 Oct 2011 18:27:35 +0000 (11:27 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 26 Oct 2011 18:09:44 +0000 (11:09 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9d5e132b9d4a9e505269ef9998acabfba8ffa975
Eric Fischer [Wed, 26 Oct 2011 17:24:56 +0000 (10:24 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I7d78b6f42431a906f9a8f624c9f0e573859ea4bc
The Android Automerger [Wed, 26 Oct 2011 14:05:34 +0000 (07:05 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Todd Poynor [Wed, 26 Oct 2011 12:22:41 +0000 (12:22 +0000)]
am
a94320e3: Settings use minimum manual brightness from config
* commit '
a94320e332f3c14b6ebb2359cc3fe363b8dfe688':
Settings use minimum manual brightness from config
Todd Poynor [Wed, 26 Oct 2011 00:11:56 +0000 (17:11 -0700)]
Settings use minimum manual brightness from config
Remove use of deprecated android.os.Power.BRIGHTNESS_DIM (20) + 10.
Change-Id: I24aff7d7fc93b4b67dedb1047bbbd4dbe3fae382
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Ed Heyl [Tue, 25 Oct 2011 20:19:41 +0000 (20:19 +0000)]
merge ics-mr0
Change-Id: I264e87a888059ada62b56a3ff7acf44cb0657cb8
Eric Fischer [Tue, 25 Oct 2011 00:09:58 +0000 (17:09 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I7df445e1dff14ef16380b371d8e14af1b6a98295
The Android Automerger [Sun, 23 Oct 2011 14:02:32 +0000 (07:02 -0700)]
merge in ics-release history after reset to master
Eric Fischer [Fri, 21 Oct 2011 23:02:31 +0000 (16:02 -0700)]
am
b8568b21: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
b8568b21118a423c6e30e736c5702b3f946b6179':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 23:00:30 +0000 (16:00 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 21:41:59 +0000 (14:41 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I1ccc1ed633e301bb2db039ea8ce1041a00daccc3
Irfan Sheriff [Fri, 21 Oct 2011 21:38:39 +0000 (14:38 -0700)]
am
cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0
* commit '
cb5fa5a44779f790fae87102a573816ecc15dd3d':
Remove wifidirect UI listing
Peter Ng [Fri, 21 Oct 2011 21:14:44 +0000 (14:14 -0700)]
Merge "Settings applications processes viewer color updates"
Eric Fischer [Fri, 21 Oct 2011 20:52:11 +0000 (13:52 -0700)]
am
388c9e2f: (-s ours) Import revised translations. DO NOT MERGE
* commit '
388c9e2f14c4b533ec9d19c1513e51353de89e75':
Import revised translations. DO NOT MERGE
Irfan Sheriff [Fri, 21 Oct 2011 20:29:53 +0000 (13:29 -0700)]
Merge "Remove wifidirect UI listing" into ics-mr0
Irfan Sheriff [Fri, 21 Oct 2011 20:11:37 +0000 (13:11 -0700)]
Remove wifidirect UI listing
Was used for testing. remove it until proper UI is
added
Bug:
5497909
Change-Id: Ic8bd1afbe348ede9031f2446b30a99d7efc88f7c
Eric Fischer [Fri, 21 Oct 2011 01:04:50 +0000 (18:04 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib962f495098fdcffdcf5f75d5813bb5fb1e94d7c
Peter Ng [Thu, 20 Oct 2011 21:04:53 +0000 (14:04 -0700)]
Settings applications processes viewer color updates
Change-Id: I233bed85c331aa909aebcd3358f7b985d9eaa473
Eric Fischer [Thu, 20 Oct 2011 18:32:06 +0000 (11:32 -0700)]
am
49a681c4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
49a681c4928d63b86fca0a546ee60b4f95d16669':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:29:07 +0000 (11:29 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Thu, 20 Oct 2011 18:16:21 +0000 (11:16 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic01568aa596d6aa3b36ee03d37f5d128e0744886
The Android Automerger [Thu, 20 Oct 2011 14:01:56 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
Danielle Millett [Wed, 19 Oct 2011 22:14:41 +0000 (15:14 -0700)]
am
8123493e: Fix
5428748: Added more options for biometric weak
* commit '
8123493ef905a210bd00b0c623459f4c86505298':
Fix
5428748: Added more options for biometric weak
Danielle Millett [Wed, 19 Oct 2011 17:58:30 +0000 (13:58 -0400)]
Fix
5428748: Added more options for biometric weak
Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.
Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
The Android Automerger [Wed, 19 Oct 2011 14:45:04 +0000 (07:45 -0700)]
merge in ics-release history after reset to master
Chih-Chung Chang [Wed, 19 Oct 2011 10:33:46 +0000 (03:33 -0700)]
am
0bcd8a95: Fix
5352588: Accept view intent without URI.
* commit '
0bcd8a95a96566d9e2c97c3305ee0dccf758ca7a':
Fix
5352588: Accept view intent without URI.
Chih-Chung Chang [Tue, 18 Oct 2011 12:00:02 +0000 (20:00 +0800)]
Fix
5352588: Accept view intent without URI.
Change-Id: Ibfcf32a7d27c3ac2d3fa3695e430b3e29f3ecd20
Eric Fischer [Tue, 18 Oct 2011 23:35:18 +0000 (16:35 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 18 Oct 2011 22:45:53 +0000 (15:45 -0700)]
Import revised translations.
Change-Id: I257f94325e7f588845bcf446e497ff827d4b2cec
Amith Yamasani [Tue, 18 Oct 2011 22:05:22 +0000 (15:05 -0700)]
Merge "Show IP address of current active link instead of just the WiFi IP address."
Dianne Hackborn [Tue, 18 Oct 2011 21:36:30 +0000 (14:36 -0700)]
am
644fa424: Work on issue #
5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500
* commit '
644fa4243b4c288c85845b3f86aab25135635729':
Work on issue #
5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
Dianne Hackborn [Tue, 18 Oct 2011 20:38:03 +0000 (13:38 -0700)]
Work on issue #
5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
With the corresponding change for the activity manager to allow the home
activity to finish itself, this activity can now be a little less dirty
and just call finish() when it finds it is not needed.
Change-Id: I1a449c7bec9fba659e27a9e918f8a9b0c55b2098
Svetoslav Ganov [Tue, 18 Oct 2011 20:16:59 +0000 (13:16 -0700)]
am
39b8eb6c: Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
* commit '
39b8eb6ce545287cd77bea465d280772669c68d1':
Accessibility service toggle setting state not preserved on screen rotation.
Svetoslav Ganov [Tue, 18 Oct 2011 20:14:38 +0000 (13:14 -0700)]
Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
Svetoslav Ganov [Tue, 18 Oct 2011 18:58:21 +0000 (11:58 -0700)]
Accessibility service toggle setting state not preserved on screen rotation.
The state of the toggle switch for enabling/disabling an accessibility service
is not preserved on screen rotation after its state has been changed once.
bug:
5478062
Change-Id: Ie453f78bc07dcd39d88bb4acf260768eccc73a74
Eric Fischer [Tue, 18 Oct 2011 18:33:36 +0000 (11:33 -0700)]
am
3d0b5254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
3d0b525491559f59d65156fca5783f80f2bddc14':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Oct 2011 18:31:06 +0000 (11:31 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Tue, 18 Oct 2011 18:13:37 +0000 (11:13 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Idddc20bec80db65304678bc5ad191cff3f2d2c5f
Peter Ng [Tue, 18 Oct 2011 17:45:34 +0000 (10:45 -0700)]
Merge "data usage color standardization"
Danielle Millett [Tue, 18 Oct 2011 17:29:48 +0000 (10:29 -0700)]
am
4c9a5fe6: Merge "Fix
5466557: Removed secondary screenlock settings labels" into ics-mr0
* commit '
4c9a5fe6a3765ecd7617b611463766cd72706458':
Fix
5466557: Removed secondary screenlock settings labels
Danielle Millett [Tue, 18 Oct 2011 17:27:41 +0000 (10:27 -0700)]
Merge "Fix
5466557: Removed secondary screenlock settings labels" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 16:33:09 +0000 (09:33 -0700)]
am
6ab0c12c: Updated bandwidth assets
* commit '
6ab0c12ca417aef49d2c287b8d215c9e66ae154d':
Updated bandwidth assets
The Android Automerger [Tue, 18 Oct 2011 14:00:51 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Justin Ho [Tue, 18 Oct 2011 01:04:18 +0000 (18:04 -0700)]
Updated bandwidth assets
Change-Id: Ia180ff9dfb020ab2f3528638f522c38f11ea010f