OSDN Git Service
Baligh Uddin [Thu, 13 Mar 2014 18:02:47 +0000 (18:02 +0000)]
am
a60df014: (-s ours) am
846f036e: (-s ours) am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a60df014e27d9cd57396655b98922394ff7d73bb':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:02:19 +0000 (18:02 +0000)]
am
42972075: am
0100a310: am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
429720754d85e1b13bc9001adaa23a0b0db04b61':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Thu, 13 Mar 2014 18:02:18 +0000 (18:02 +0000)]
am
c736f794: am
a74da813: am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
c736f794ac38b832b5ffde28502580a9b20b722b':
DO NOT MERGE Remove extra fragment in captioning preferences
Baligh Uddin [Thu, 13 Mar 2014 17:19:21 +0000 (17:19 +0000)]
am
846f036e: (-s ours) am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
846f036ef15a2bea6c522e5b75b351b28c29953c':
Import translations. DO NOT MERGE
Przemyslaw Szczepaniak [Thu, 13 Mar 2014 15:32:48 +0000 (15:32 +0000)]
am
6829c48c: Merge "Fix F/C in TTS settings"
* commit '
6829c48c36fceebb46989f8ee25c369fa5f7adeb':
Fix F/C in TTS settings
Przemyslaw Szczepaniak [Thu, 13 Mar 2014 15:26:47 +0000 (15:26 +0000)]
Merge "Fix F/C in TTS settings"
Alan Viverette [Thu, 13 Mar 2014 10:01:45 +0000 (10:01 +0000)]
am
0100a310: am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
0100a310d8184baf9576925d160f8af09aa93b10':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Thu, 13 Mar 2014 10:01:42 +0000 (10:01 +0000)]
am
a74da813: am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
a74da813ec622822c8bb8b4524439c81e8b90dfa':
DO NOT MERGE Remove extra fragment in captioning preferences
Shuhrat Dehkanov [Wed, 12 Mar 2014 13:57:08 +0000 (22:57 +0900)]
Fix F/C in TTS settings
This is an attempt to fix uncaught MissingResourceException
that would be thrown if default language of selected engine is
set to a locale that has no 3-letter country/language code.
Please see https://code.google.com/p/android/issues/detail?id=63122
Change-Id: Iccb2a55f5f7a97819310fd888559650fe7febe4a
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
RoboErik [Wed, 12 Mar 2014 21:12:27 +0000 (21:12 +0000)]
am
5791cecc: b/
12068020 Update calls to InputManager. Do not merge
* commit '
5791cecc9e0a4169c71b87696973441071e295c8':
b/
12068020 Update calls to InputManager. Do not merge
RoboErik [Wed, 8 Jan 2014 01:34:38 +0000 (17:34 -0800)]
b/
12068020 Update calls to InputManager. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/400419/
This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.
Change-Id: I9072c5b5c822b73188a6c572945f87b4a7c03139
Baligh Uddin [Tue, 11 Mar 2014 17:41:25 +0000 (17:41 +0000)]
am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
14b82fd73f59f51dffee9562057ab747f12134d3':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Mar 2014 17:37:53 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Narayan Kamath [Tue, 11 Mar 2014 15:14:15 +0000 (15:14 +0000)]
am
c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
* commit '
c776bbb1562b844297260790fd1a50382396a3f9':
Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
Narayan Kamath [Tue, 11 Mar 2014 15:07:13 +0000 (15:07 +0000)]
Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
Narayan Kamath [Tue, 11 Mar 2014 13:05:37 +0000 (13:05 +0000)]
Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
This reverts commit
9ebc27c73e7096159024605a2c4ab1a4b3abbd83.
Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
Alan Viverette [Tue, 11 Mar 2014 02:15:28 +0000 (02:15 +0000)]
am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Tue, 11 Mar 2014 02:15:27 +0000 (02:15 +0000)]
am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
d43d5becb359cfdd5e30f691724739ab216011f0':
DO NOT MERGE Remove extra fragment in captioning preferences
Alan Viverette [Tue, 11 Mar 2014 02:11:52 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:11:41 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
Baligh Uddin [Mon, 10 Mar 2014 22:28:38 +0000 (15:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
Auto-generated-cl: translation import
Wei Wang [Sat, 8 Mar 2014 02:11:25 +0000 (02:11 +0000)]
am
6663b245: am
a8e634ca: (-s ours) am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
6663b24574c8a3b1e8bde7737a28299bef743f2f':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:07:30 +0000 (02:07 +0000)]
am
a8e634ca: (-s ours) am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
a8e634ca5367dde80873a0b7643e27284db56336':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:02:19 +0000 (02:02 +0000)]
am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
104eea0b97c63b97040dc26ddf3635257e1b19a2':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:00:36 +0000 (02:00 +0000)]
Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
Alan Viverette [Fri, 7 Mar 2014 22:06:29 +0000 (14:06 -0800)]
DO NOT MERGE Add preference for caption text opacity
BUG:
11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
Alan Viverette [Fri, 7 Mar 2014 22:06:07 +0000 (14:06 -0800)]
DO NOT MERGE Remove extra fragment in captioning preferences
BUG:
11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
Rob Fletcher [Thu, 6 Mar 2014 22:51:57 +0000 (22:51 +0000)]
am
8ce54bd6: am
04f36983: (-s ours) am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
8ce54bd640ddab13416d7a105df63bf29df2ae45':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Thu, 6 Mar 2014 22:41:29 +0000 (22:41 +0000)]
am
04f36983: (-s ours) am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
04f3698345f804848ea7f03c6022dbdb0d8ac28d':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Thu, 6 Mar 2014 21:59:31 +0000 (21:59 +0000)]
am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
549a39b49510dad27da588714f848dc891913239':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Tue, 25 Feb 2014 18:16:12 +0000 (18:16 +0000)]
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML
Bug:
12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
Wei Wang [Mon, 3 Mar 2014 22:58:54 +0000 (14:58 -0800)]
DO NOT MERGE Change bluetooth off display message.
Cherry picking ble advertising changes from master to KLP MR2.
b/
13137996
Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
Matthew Xie [Thu, 27 Feb 2014 21:39:34 +0000 (21:39 +0000)]
am
85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946"
* commit '
85fb88ee10c6bb901d30e50038b4a86252ff8c68':
HTML injection fix for bluetooth pairing, issue 65946
Matthew Xie [Thu, 27 Feb 2014 21:32:50 +0000 (21:32 +0000)]
Merge "HTML injection fix for bluetooth pairing, issue 65946"
Rob Fletcher [Tue, 25 Feb 2014 18:16:12 +0000 (18:16 +0000)]
HTML injection fix for bluetooth pairing, issue 65946
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML
Bug:
12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
Narayan Kamath [Thu, 27 Feb 2014 12:05:07 +0000 (12:05 +0000)]
am
7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
* commit '
7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
Narayan Kamath [Thu, 27 Feb 2014 12:00:22 +0000 (12:00 +0000)]
Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
Narayan Kamath [Thu, 27 Feb 2014 12:00:08 +0000 (12:00 +0000)]
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
This reverts commit
d5d9d373619de3437593763578854a83f5539306.
Change-Id: I76eeb6f95a4cbbd241db1fb90528b4d91ddf7707
Narayan Kamath [Thu, 27 Feb 2014 11:46:48 +0000 (11:46 +0000)]
am
14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
* commit '
14b0da749c73c1e0201adee1b398a1955b7d624e':
Set 24 hour pref. with ACTION_TIME_CHANGED.
Narayan Kamath [Thu, 27 Feb 2014 11:42:10 +0000 (11:42 +0000)]
Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
Narayan Kamath [Tue, 25 Feb 2014 16:49:20 +0000 (16:49 +0000)]
Set 24 hour pref. with ACTION_TIME_CHANGED.
Sent as a boolean extra EXTRA_TIME_PREF_24_HOUR_FORMAT.
Change-Id: I7fbd59eacdeb298d046da950d7045f0bab53b462
Matthew Xie [Mon, 24 Feb 2014 14:25:28 +0000 (14:25 +0000)]
am
0223f9c5: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"
* commit '
0223f9c5ddfdbcd2c759d1b0cf289844ca0438c0':
Bluetooth: GAP: Cancel the pairing notification on bond state change
Matthew Xie [Mon, 24 Feb 2014 00:49:19 +0000 (00:49 +0000)]
Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"
Jeff Sharkey [Fri, 21 Feb 2014 17:21:48 +0000 (17:21 +0000)]
am
14136c7c: Merge "Settings: Fix the memory leak in Settings"
* commit '
14136c7cdfee7525a97cfee6eec038994668b6a5':
Settings: Fix the memory leak in Settings
Jeff Sharkey [Fri, 21 Feb 2014 17:17:22 +0000 (17:17 +0000)]
Merge "Settings: Fix the memory leak in Settings"
Baligh Uddin [Thu, 20 Feb 2014 21:06:07 +0000 (21:06 +0000)]
am
a9d878ef: (-s ours) am
af03def3: (-s ours) am
63a354ee: (-s ours) am
d83484db: (-s ours) Import translations. DO NOT MERGE
* commit '
a9d878ef67f54c878cef0868767ed8e9a5b8c063':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:02:54 +0000 (21:02 +0000)]
am
af03def3: (-s ours) am
63a354ee: (-s ours) am
d83484db: (-s ours) Import translations. DO NOT MERGE
* commit '
af03def380ca594838ef6caff4f8c23dc78e821c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 20:59:28 +0000 (20:59 +0000)]
am
63a354ee: (-s ours) am
d83484db: (-s ours) Import translations. DO NOT MERGE
* commit '
63a354ee094f3e71773cbdd29359b5c28df2b9f0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 20:56:19 +0000 (20:56 +0000)]
am
d83484db: (-s ours) Import translations. DO NOT MERGE
* commit '
d83484dba0749e01cf80a85cd0d2648a79f9fdf4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 15:23:08 +0000 (07:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I96d7cdea504fe320dc1768f1e0dbae23d5901fbd
Auto-generated-cl: translation import
Srinu Jella [Mon, 2 Dec 2013 10:18:45 +0000 (15:48 +0530)]
Bluetooth: GAP: Cancel the pairing notification on bond state change
Cancel the pairing notification on bond state change happens from
BOND_BONDING to BOND_NONE. Otherwise it will present in the
notification area until it gets cancelled by opening it and press
cancel on pairing dialog.
Change-Id: I96f673e29e612cd748165a1323a5b4a4276a843c
Jeff Sharkey [Thu, 6 Feb 2014 22:36:40 +0000 (22:36 +0000)]
am
1f37bff7: Merge "Total and available fields missing in Settings storage menu"
* commit '
1f37bff7d26aeb3d1f16deb4368f8387e2d4530f':
Total and available fields missing in Settings storage menu
Jeff Sharkey [Thu, 6 Feb 2014 22:31:26 +0000 (22:31 +0000)]
am
5b4350f2: Merge "Fix memory leak in ManageApplication"
* commit '
5b4350f22f81662436992504e711e462de7a790f':
Fix memory leak in ManageApplication
Jeff Sharkey [Thu, 6 Feb 2014 22:29:11 +0000 (22:29 +0000)]
Merge "Total and available fields missing in Settings storage menu"
Jeff Sharkey [Thu, 6 Feb 2014 22:25:30 +0000 (22:25 +0000)]
Merge "Fix memory leak in ManageApplication"
Amith Yamasani [Wed, 5 Feb 2014 20:46:37 +0000 (20:46 +0000)]
Amith Yamasani [Wed, 5 Feb 2014 20:43:52 +0000 (20:43 +0000)]
Amith Yamasani [Wed, 5 Feb 2014 20:40:39 +0000 (20:40 +0000)]
am
454df35e: am
3c4603ef: am
8f948217: am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
454df35ee323ec9ca21b0c1ed982eba263df70e3':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:37:21 +0000 (20:37 +0000)]
am
3c4603ef: am
8f948217: am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
3c4603ef1c19510bd4a58aee19935e084603c69b':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:35:24 +0000 (20:35 +0000)]
am
8f948217: am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
8f9482170835059c11cffa9c554191306db49fbd':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:33:48 +0000 (12:33 -0800)]
am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
c68a6bde44203cae70c50f6194cce22c9be5c48e':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:30:42 +0000 (12:30 -0800)]
am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
0ad774458a627cc4608c717a7efdadf2404d973c':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:52:23 +0000 (11:52 -0800)]
am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:27:30 +0000 (11:27 -0800)]
am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:22:46 +0000 (11:22 -0800)]
am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
1ba09366ccc174d71572ddbe0b80814982d2ae9b':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:19:03 +0000 (11:19 -0800)]
am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
0fce6123bddf505d1dab3d7a7daff05a0832c007':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:15:01 +0000 (11:15 -0800)]
am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:09:40 +0000 (11:09 -0800)]
am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:04:25 +0000 (11:04 -0800)]
am
c7843db0: Remove unused DebugIntentSender
* commit '
c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
Amith Yamasani [Thu, 30 Jan 2014 00:11:03 +0000 (16:11 -0800)]
Remove unused DebugIntentSender
Bug:
12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit
26430486e4082c89e31a9489e4309566bda2fec8)
Brian Carlstrom [Fri, 31 Jan 2014 13:00:33 +0000 (13:00 +0000)]
am
f2e9be9a: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4':
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Thu, 30 Jan 2014 21:50:52 +0000 (21:50 +0000)]
Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:02 +0000 (13:14 -0800)]
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: I1937c2ff758214e1c9d369e475ae4efbba4f9dec
John Spurlock [Tue, 28 Jan 2014 15:48:12 +0000 (15:48 +0000)]
am
04119285: am
cb8a5354: am
3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit '
041192855ed8b025246578d80f0b372bf346a2f1':
'When to daydream' dialog does not follow the JB dialog design guide
John Spurlock [Tue, 28 Jan 2014 15:44:53 +0000 (15:44 +0000)]
am
cb8a5354: am
3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit '
cb8a53541ec142ee5d57f163496583518ddb5c6e':
'When to daydream' dialog does not follow the JB dialog design guide
John Spurlock [Tue, 28 Jan 2014 15:40:45 +0000 (15:40 +0000)]
am
3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit '
3f0f02b94e5be6724659f860aef5e637ff61d3aa':
'When to daydream' dialog does not follow the JB dialog design guide
John Spurlock [Tue, 28 Jan 2014 14:03:41 +0000 (14:03 +0000)]
Merge "'When to daydream' dialog does not follow the JB dialog design guide"
Per Allard [Tue, 25 Jun 2013 07:54:13 +0000 (09:54 +0200)]
'When to daydream' dialog does not follow the JB dialog design guide
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.
Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
Wei Wang [Tue, 19 Nov 2013 09:32:10 +0000 (01:32 -0800)]
BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
Wei Wang [Wed, 13 Nov 2013 01:27:03 +0000 (17:27 -0800)]
Add ble settings strings.
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
Jun Su [Thu, 18 Jul 2013 09:43:26 +0000 (17:43 +0800)]
Fix memory leak in ManageApplication
ApplicationsAdapter new a Session member and make it has a reference to
it self. If we don't release it explicitly, the cross reference will
cause memory leak.
Change-Id: Iecce35ae1d56d98cee6347e84d3a3ff57f3b15a5
Jeff Sharkey [Fri, 10 Jan 2014 23:14:20 +0000 (23:14 +0000)]
am
0cd68e04: am
859909fe: am
b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit '
0cd68e04a9f74aa5afc3e843db498568dd5fa173':
Fix null pointer exceptions in NetworkPolicyEditor
Jeff Sharkey [Fri, 10 Jan 2014 23:11:35 +0000 (23:11 +0000)]
am
859909fe: am
b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit '
859909fee87d4dab6964977834a780acfd2310b2':
Fix null pointer exceptions in NetworkPolicyEditor
Jeff Sharkey [Fri, 10 Jan 2014 23:08:40 +0000 (15:08 -0800)]
am
b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit '
b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
Fix null pointer exceptions in NetworkPolicyEditor
Jeff Sharkey [Fri, 10 Jan 2014 23:04:31 +0000 (23:04 +0000)]
Merge "Fix null pointer exceptions in NetworkPolicyEditor"
Amith Yamasani [Tue, 7 Jan 2014 18:48:22 +0000 (18:48 +0000)]
am
3cfb6767: am
e7d8485a: am
5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '
3cfb676758b5ec44100a0a8cd47f1c4a7a615775':
Dont show "Erase SD Card" when there is none
Amith Yamasani [Tue, 7 Jan 2014 18:45:23 +0000 (18:45 +0000)]
am
e7d8485a: am
5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '
e7d8485a23def2f0670ba2813f5589cbef562d4d':
Dont show "Erase SD Card" when there is none
Amith Yamasani [Tue, 7 Jan 2014 18:42:15 +0000 (10:42 -0800)]
am
5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '
5be77489e2f1f7b5c68763cf7660e844587d5e9e':
Dont show "Erase SD Card" when there is none
Amith Yamasani [Tue, 7 Jan 2014 18:37:53 +0000 (18:37 +0000)]
Merge "Dont show "Erase SD Card" when there is none"
Baligh Uddin [Tue, 7 Jan 2014 05:50:13 +0000 (05:50 +0000)]
am
2659aeb1: (-s ours) am
094de604: (-s ours) am
3f426653: (-s ours) am
6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '
2659aeb1fae6cb031647321df59ad9bbff86847e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:46:12 +0000 (05:46 +0000)]
am
094de604: (-s ours) am
3f426653: (-s ours) am
6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '
094de60467fc1cb2d2635a3a4aa82dff79d355fc':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:07:02 +0000 (21:07 -0800)]
am
3f426653: (-s ours) am
6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '
3f4266533121113a62e33fc4b3e1072f841f5d50':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:04:29 +0000 (21:04 -0800)]
am
6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '
6b8a7116a2203b32cff432fd1602cc3e186b2608':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 02:46:29 +0000 (18:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06e9ef8b9e6bdabcb6daf0ba0761a367bd798918
Auto-generated-cl: translation import
Elliott Hughes [Fri, 3 Jan 2014 21:42:53 +0000 (21:42 +0000)]
am
8995a94d: am
97886741: am
f85d9841: Merge "Fix elapsed time formatting."
* commit '
8995a94d4eb7d8de10ae0758751357f452a898c9':
Fix elapsed time formatting.
Elliott Hughes [Fri, 3 Jan 2014 21:39:20 +0000 (21:39 +0000)]
am
97886741: am
f85d9841: Merge "Fix elapsed time formatting."
* commit '
97886741b916048cd5974d336c18f2b625dcb7fd':
Fix elapsed time formatting.
Elliott Hughes [Fri, 3 Jan 2014 21:36:27 +0000 (13:36 -0800)]
am
f85d9841: Merge "Fix elapsed time formatting."
* commit '
f85d9841f8e198de656973a2102d3239e628390a':
Fix elapsed time formatting.
Elliott Hughes [Fri, 3 Jan 2014 21:28:12 +0000 (21:28 +0000)]
Merge "Fix elapsed time formatting."
Elliott Hughes [Fri, 3 Jan 2014 20:14:13 +0000 (12:14 -0800)]
Fix elapsed time formatting.
We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.
Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
Baligh Uddin [Tue, 31 Dec 2013 00:46:25 +0000 (00:46 +0000)]
am
d28125b7: (-s ours) am
9114be55: (-s ours) am
c9d1e6f4: (-s ours) am
0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '
d28125b742479ce571b7dd32b2c90169200b5479':
Import translations. DO NOT MERGE
OSDN Git Service
