OSDN Git Service
Elliott Hughes [Thu, 6 Sep 2012 23:43:46 +0000 (16:43 -0700)]
am
0c0d6052: am
105d879c: am
98d9380a: am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
0c0d605231e78c3a883b88b4abbc46ee29a7a194':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:41:35 +0000 (16:41 -0700)]
am
105d879c: am
98d9380a: am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
105d879ccef2517a07a15f29b956be739504fa73':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:39:41 +0000 (16:39 -0700)]
am
98d9380a: am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
98d9380a5c3c6a6bfa5687af993ea43c882226b9':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:37:44 +0000 (16:37 -0700)]
am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:09:04 +0000 (16:09 -0700)]
resolved conflicts for merge of
33f86196 to stage-aosp-master
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
Elliott Hughes [Thu, 6 Sep 2012 22:29:46 +0000 (15:29 -0700)]
Merge "Stop hard-coding sample 12- and 24-hour times."
Elliott Hughes [Thu, 6 Sep 2012 21:49:35 +0000 (14:49 -0700)]
Stop hard-coding sample 12- and 24-hour times.
Bug:
6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
Baligh Uddin [Thu, 6 Sep 2012 18:19:02 +0000 (11:19 -0700)]
am
2c705626: (-s ours) am
d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
2c705626e5cfa29adddb0f82fca261560d4fd9a8':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 6 Sep 2012 18:17:39 +0000 (11:17 -0700)]
am
d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
d4e216bc9eb9b8aecd031a5f3c2a412857333a99':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 6 Sep 2012 18:16:31 +0000 (11:16 -0700)]
Merge "Revert "Import translations. DO NOT MERGE""
Baligh Uddin [Thu, 6 Sep 2012 18:16:17 +0000 (11:16 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Thu, 6 Sep 2012 18:16:03 +0000 (11:16 -0700)]
Revert "Import translations. DO NOT MERGE"
Broke the build.
This reverts commit
d08dce4e693d898f12dacac23e84cf17ec3d6ec6
Change-Id: I512a72571adfa5c8cd893a72c7dc40570decec47
Baligh Uddin [Thu, 6 Sep 2012 18:15:52 +0000 (11:15 -0700)]
Revert "Import translations. DO NOT MERGE"
Broke the build.
This reverts commit
9dcb0727d0d7be183d615d7bdfb6836d2017966a
Change-Id: I3a468f51981456476ca9c76086f0a5c08ba6a61b
Baligh Uddin [Thu, 6 Sep 2012 17:57:48 +0000 (10:57 -0700)]
am
237882f1: (-s ours) am
d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
237882f1480aebe242dad3bae09a362a22a2e5a4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 6 Sep 2012 17:55:40 +0000 (10:55 -0700)]
am
d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
d2dec8c70eb8f745425c09070069ef52d306b233':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 6 Sep 2012 17:53:13 +0000 (10:53 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 6 Sep 2012 17:51:57 +0000 (10:51 -0700)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Thu, 6 Sep 2012 16:16:31 +0000 (09:16 -0700)]
am
daed50bd: (-s ours) am
710aeba1: am
c53ce268: (-s ours) Reconcile with jb-release - do not merge
* commit '
daed50bd1bd8351b852f4cd40bfe444074a5846e':
The Android Open Source Project [Thu, 6 Sep 2012 16:11:22 +0000 (09:11 -0700)]
am
710aeba1: am
c53ce268: (-s ours) Reconcile with jb-release - do not merge
* commit '
710aeba1ce0bf2d121aaaf659284074750b43c6e':
The Android Open Source Project [Thu, 6 Sep 2012 15:21:38 +0000 (08:21 -0700)]
am
c53ce268: (-s ours) Reconcile with jb-release - do not merge
* commit '
c53ce26836eccfe9c0bb315d965bc73a9bd7b214':
The Android Open Source Project [Thu, 6 Sep 2012 15:20:51 +0000 (08:20 -0700)]
am
f3541a5f: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
f3541a5f0510c1d3f214358c0b7e06470c6d4b3b':
The Android Open Source Project [Thu, 6 Sep 2012 15:09:26 +0000 (08:09 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I34fdfc427ea0fd0dc887303e7c019226a665f4de
The Android Open Source Project [Thu, 6 Sep 2012 14:54:52 +0000 (07:54 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I9619964e59d6d3f9036372e67278498472f1d290
The Android Automerger [Thu, 6 Sep 2012 13:34:42 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Charles Chen [Thu, 6 Sep 2012 00:17:43 +0000 (17:17 -0700)]
am
5998c8ae: am
ee04e472: Merge "Add content descriptions to power control widget." into jb-mr1-dev
* commit '
5998c8ae243f5f84cd22ae283c5abd5373c436bd':
Add content descriptions to power control widget.
Charles Chen [Thu, 6 Sep 2012 00:14:55 +0000 (17:14 -0700)]
am
ee04e472: Merge "Add content descriptions to power control widget." into jb-mr1-dev
* commit '
ee04e47216ca947dfc781d1b4116f252dd2aa5a4':
Add content descriptions to power control widget.
Charles Chen [Thu, 6 Sep 2012 00:13:24 +0000 (17:13 -0700)]
Merge "Add content descriptions to power control widget." into jb-mr1-dev
Baligh Uddin [Wed, 5 Sep 2012 21:05:16 +0000 (14:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaad0437ec086a52ec61bea09e31f60884d72c211
Auto-generated-cl: translation import
Baligh Uddin [Wed, 5 Sep 2012 21:02:53 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822
Auto-generated-cl: translation import
John Spurlock [Wed, 5 Sep 2012 15:01:01 +0000 (08:01 -0700)]
am
fb2a89c6: am
1537e8b3: Dream settings: list items back to constant height
* commit '
fb2a89c686ffe8b37cd90359987505e5425e2ffe':
Dream settings: list items back to constant height
John Spurlock [Wed, 5 Sep 2012 14:59:19 +0000 (07:59 -0700)]
am
1537e8b3: Dream settings: list items back to constant height
* commit '
1537e8b3e8d81bf404f6aa70c8ca514f3ff62dd5':
Dream settings: list items back to constant height
John Spurlock [Tue, 4 Sep 2012 11:55:46 +0000 (07:55 -0400)]
Dream settings: list items back to constant height
Expanding/collapsing items removed, settings icon shown on right
with divider if applicable.
New "Start" action on the action bar to start dreaming. This is
no longer in preview/test mode, but a call to .dream().
Bug:
7010260
Change-Id: Ia1d8b9a70218dcc598bf62befbf545f572bbc6b1
The Android Automerger [Wed, 5 Sep 2012 13:34:36 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Matthew Xie [Tue, 4 Sep 2012 22:34:23 +0000 (15:34 -0700)]
am
0aeb8f2e: am
952146ee: Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
* commit '
0aeb8f2ee1fcdaaf624e38a4abef47a1a5909b95':
Clear profile connnection status of bonded devices when BT is turned off
Matthew Xie [Tue, 4 Sep 2012 22:32:28 +0000 (15:32 -0700)]
am
952146ee: Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
* commit '
952146ee8f13ea87a890e3e4f7726fe49b60fc3d':
Clear profile connnection status of bonded devices when BT is turned off
Matthew Xie [Tue, 4 Sep 2012 22:31:03 +0000 (15:31 -0700)]
Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
Ganesh Ganapathi Batta [Wed, 29 Aug 2012 21:32:26 +0000 (14:32 -0700)]
Clear profile connnection status of bonded devices when BT is turned off
When BT is turned off in mid of a profile connection, sometimes
profile connection status change message with status= DISCONNECTED
does not reach Settings app which results in stale connection status
for the device when BT is enabled next time. Fixed the issue
By explicitly clearing the connection status for all paired devices
when BT is turning OFF
Change-Id: I5d0c158636f3b62eff9094821abe2ef3a7cab16e
The Android Automerger [Tue, 4 Sep 2012 13:33:28 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Przemyslaw Szczepaniak [Mon, 3 Sep 2012 15:12:07 +0000 (08:12 -0700)]
am
6b329db9: am
22dc1fe2: Make TTS languages list sorted.
* commit '
6b329db9ebc04f94f5b1a3cd7f612c1cc699fae4':
Make TTS languages list sorted.
Przemyslaw Szczepaniak [Mon, 3 Sep 2012 15:10:32 +0000 (08:10 -0700)]
am
22dc1fe2: Make TTS languages list sorted.
* commit '
22dc1fe2bae886b385ddc22ee4f2819e5764c71a':
Make TTS languages list sorted.
Przemyslaw Szczepaniak [Mon, 3 Sep 2012 13:53:10 +0000 (14:53 +0100)]
Make TTS languages list sorted.
Also makes sure that languages list always have underlying array after onCreate.
Bug:
5640782
Change-Id: Id85d0099efccc9a64458d24853b5c98a35307b38
The Android Automerger [Mon, 3 Sep 2012 13:34:43 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Fri, 31 Aug 2012 17:28:15 +0000 (10:28 -0700)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 31 Aug 2012 16:33:10 +0000 (09:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba535ca4a6090d6c3b9e4a270323f4af52ae611b
Auto-generated-cl: translation import
Jean-Baptiste Queru [Fri, 31 Aug 2012 14:40:33 +0000 (07:40 -0700)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
38136be4a356784e0bad9dcfa5d2115fc2221704.
Mathias Agopian [Fri, 31 Aug 2012 09:29:26 +0000 (02:29 -0700)]
am
66514b78: (-s ours) am
c888555f: FIX BUILD (DO NOT MERGE)
* commit '
66514b7899eb2744d51b0f1463f4e2aa98da7eed':
FIX BUILD (DO NOT MERGE)
Mathias Agopian [Fri, 31 Aug 2012 09:27:07 +0000 (02:27 -0700)]
am
c888555f: FIX BUILD (DO NOT MERGE)
* commit '
c888555f8907328a8625cb2301e081fcd143f2c5':
FIX BUILD (DO NOT MERGE)
Mathias Agopian [Fri, 31 Aug 2012 08:59:05 +0000 (01:59 -0700)]
FIX BUILD (DO NOT MERGE)
Revert "Import translations. DO NOT MERGE"
This reverts commit
b3e78cc41f16b0227a5fd31431c95f911c268567.
Change-Id: Ifbff2b21c249dab09126b03a8cbbccde964781df
Baligh Uddin [Fri, 31 Aug 2012 05:15:27 +0000 (22:15 -0700)]
am
968a7be2: (-s ours) am
f9e25e83: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
968a7be25e0f6d13d92d38694ea5df8209aa1e05':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 Aug 2012 05:12:24 +0000 (22:12 -0700)]
am
f9e25e83: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f9e25e833f3bed04ebdb6481176584dfe3691088':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 Aug 2012 05:10:15 +0000 (22:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 31 Aug 2012 05:09:45 +0000 (22:09 -0700)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Fri, 31 Aug 2012 00:31:40 +0000 (17:31 -0700)]
am
1a3b2c00: am
788cde4c: Rename settings title for user management screen
* commit '
1a3b2c00eb43f9d737b85eed04a4ea6547b7ba4a':
Rename settings title for user management screen
Amith Yamasani [Fri, 31 Aug 2012 00:28:53 +0000 (17:28 -0700)]
am
788cde4c: Rename settings title for user management screen
* commit '
788cde4ce41ec633056c9c2b1360826ad72cda40':
Rename settings title for user management screen
Amith Yamasani [Fri, 31 Aug 2012 00:25:20 +0000 (17:25 -0700)]
Rename settings title for user management screen
Change-Id: I0a57d52eb0c4e4fb8a8ab1449b98751927da2519
alanv [Fri, 31 Aug 2012 00:08:01 +0000 (17:08 -0700)]
Add content descriptions to power control widget.
Bug:
6361285
Change-Id: I4fd7ed519de9a5b7e50e6905550695fad02bcc42
Jeff Sharkey [Thu, 30 Aug 2012 22:30:22 +0000 (15:30 -0700)]
am
821ee347: am
037df2cb: Merge "Surface storage usage of other users." into jb-mr1-dev
* commit '
821ee3476aeb8cba856d78df2a776d0876be42f0':
Surface storage usage of other users.
Jeff Sharkey [Thu, 30 Aug 2012 22:28:39 +0000 (15:28 -0700)]
am
037df2cb: Merge "Surface storage usage of other users." into jb-mr1-dev
* commit '
037df2cb182edb3070080625031073d30abfc56a':
Surface storage usage of other users.
Jeff Sharkey [Thu, 30 Aug 2012 22:26:50 +0000 (15:26 -0700)]
Merge "Surface storage usage of other users." into jb-mr1-dev
Jeff Sharkey [Thu, 30 Aug 2012 22:20:10 +0000 (15:20 -0700)]
Surface storage usage of other users.
Bring up separate StorageMeasurement sessions bound to other users
on device, and surface their total usage as teal colors. Exclude
app code size when measuring secondary users. Shift preferences to
using keys instead of fragile index ordering.
Bug:
7003520
Change-Id: I214d0b223e53955df71104502596743f049f2027
John Spurlock [Thu, 30 Aug 2012 21:01:34 +0000 (14:01 -0700)]
am
40db7c50: am
7af2aa52: More traditional list item style for dreams settings.
* commit '
40db7c50fd25d8ad051a4a87886cddc02e6d8336':
More traditional list item style for dreams settings.
John Spurlock [Thu, 30 Aug 2012 20:59:04 +0000 (13:59 -0700)]
am
7af2aa52: More traditional list item style for dreams settings.
* commit '
7af2aa52ac2e458969abeaefec217f6a4f976767':
More traditional list item style for dreams settings.
John Spurlock [Thu, 30 Aug 2012 18:58:16 +0000 (14:58 -0400)]
More traditional list item style for dreams settings.
Other improvements:
- remove "Start dreaming now", promote "When to dream" to action bar
- added logging
- hide dream settings button if n/a
- new flat style for settings/preview + dividers
- refresh dreams list when packages are installed/uninstalled
- added placeholder for help url
Bug:
7010260
Change-Id: Ia443b4f76678eaf1a52b907d50aefb0d8f7e4748
The Android Automerger [Thu, 30 Aug 2012 13:34:30 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Thu, 30 Aug 2012 03:19:54 +0000 (20:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b4485deee442c978e1ee4e5f93e68a906bdab2f
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Aug 2012 03:17:20 +0000 (20:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie33abb2dac44b49a64040688f9ffe7a1d7add9f3
Auto-generated-cl: translation import
John Spurlock [Wed, 29 Aug 2012 23:00:02 +0000 (16:00 -0700)]
am
79bd0a75: am
2dff5b10: Merge "New dream settings - first cut" into jb-mr1-dev
* commit '
79bd0a75554f11ee85a690976da0f7644e025eda':
New dream settings - first cut
John Spurlock [Wed, 29 Aug 2012 22:57:54 +0000 (15:57 -0700)]
am
2dff5b10: Merge "New dream settings - first cut" into jb-mr1-dev
* commit '
2dff5b109b9dd4b55cb64d89ff55c56318052b5c':
New dream settings - first cut
John Spurlock [Wed, 29 Aug 2012 22:55:25 +0000 (15:55 -0700)]
Merge "New dream settings - first cut" into jb-mr1-dev
Jeff Brown [Wed, 29 Aug 2012 22:49:52 +0000 (15:49 -0700)]
am
b519a126: am
b2b54eec: Add new setting to control overlay displays.
* commit '
b519a1268eb36e7e5f7967e5ef4bc471e647236a':
Add new setting to control overlay displays.
Jeff Brown [Wed, 29 Aug 2012 22:46:43 +0000 (15:46 -0700)]
am
b2b54eec: Add new setting to control overlay displays.
* commit '
b2b54eec86bc5b5830e4480407cbd1fccfd21256':
Add new setting to control overlay displays.
The Android Automerger [Wed, 29 Aug 2012 21:29:55 +0000 (14:29 -0700)]
merge in jb-release history after reset to jb-dev
John Spurlock [Wed, 22 Aug 2012 13:21:58 +0000 (09:21 -0400)]
New dream settings - first cut
First draft implementation of mocks for dream settings.
Want to merge for the weekly build, so a few things remain, namely:
- flat style for preview/settings buttons + dividers
- animation between dream row expanded/collapsed state
- wire up the help url
- possibly ditch the non-standard style
- add logging
- refresh when packages are installed/uninstalled
Bug:
7010260
Change-Id: I96e3ab944170925bd76edf7b8b1127adfffc6262
The Android Automerger [Wed, 29 Aug 2012 19:43:12 +0000 (12:43 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 29 Aug 2012 13:34:22 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Brown [Wed, 29 Aug 2012 09:33:06 +0000 (02:33 -0700)]
Add new setting to control overlay displays.
Change-Id: I9582bb149dca716699ef5977ef8f84bb3136e0c0
Baligh Uddin [Tue, 28 Aug 2012 22:19:24 +0000 (15:19 -0700)]
am
c07c70be: (-s ours) am
c6015d2f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c07c70bea2b932f4a8d22195a50a3256296718ad':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 28 Aug 2012 22:16:40 +0000 (15:16 -0700)]
am
c6015d2f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c6015d2f593d0e5ef909d7157df4b15831236acb':
Import translations. DO NOT MERGE
Nick Kralevich [Tue, 28 Aug 2012 22:15:15 +0000 (15:15 -0700)]
am
61720061: am
7e7912de: ChooseLockPassword: allow spaces in passwords
* commit '
6172006184829f2da6e49de5609775e1caa41648':
ChooseLockPassword: allow spaces in passwords
Baligh Uddin [Tue, 28 Aug 2012 22:15:08 +0000 (15:15 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 28 Aug 2012 22:14:00 +0000 (15:14 -0700)]
Merge "Import translations. DO NOT MERGE"
Nick Kralevich [Tue, 28 Aug 2012 22:13:33 +0000 (15:13 -0700)]
am
7e7912de: ChooseLockPassword: allow spaces in passwords
* commit '
7e7912de4fb44481ded8e17d5ac1d7a1c9a0d184':
ChooseLockPassword: allow spaces in passwords
Baligh Uddin [Tue, 28 Aug 2012 21:32:29 +0000 (14:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e28e68da7bccb82034f893665924808425ce428
Auto-generated-cl: translation import
Baligh Uddin [Tue, 28 Aug 2012 21:29:09 +0000 (14:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I884b6bb2bd0045049a7578235563896afe9414a7
Auto-generated-cl: translation import
Nick Kralevich [Tue, 28 Aug 2012 17:33:45 +0000 (10:33 -0700)]
ChooseLockPassword: allow spaces in passwords
This fixes http://code.google.com/p/android/issues/detail?id=35988
Change-Id: I1880d7e41028f034e75a048226cce3bf96845a09
Wink Saville [Tue, 28 Aug 2012 20:02:36 +0000 (13:02 -0700)]
am
e07b883a: am
ca786f39: am
c5fc6231: am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
e07b883a1a598f0cd9ccdd96c3eb6281c28c7ea0':
Fix memory leak in ApnSettings-activity
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:02:25 +0000 (13:02 -0700)]
am
9b4d7aee: am
72d3f85d: am
300457ba: am
38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
* commit '
9b4d7aee4f74193ff1d642094a2947fc90fea24d':
Enable to delete a stored persistent group from p2p settings.
Wink Saville [Tue, 28 Aug 2012 19:21:04 +0000 (12:21 -0700)]
am
ca786f39: am
c5fc6231: am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
ca786f3989c93ac1c368151c1cede7b47fc10711':
Fix memory leak in ApnSettings-activity
Wink Saville [Tue, 28 Aug 2012 19:18:57 +0000 (12:18 -0700)]
am
c5fc6231: am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
c5fc6231312b21efb601367bae28d63f9b26ac52':
Fix memory leak in ApnSettings-activity
Wink Saville [Tue, 28 Aug 2012 19:13:59 +0000 (12:13 -0700)]
am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
2d6b52bd38046abe1761cf0cc1f0c415e4a24fef':
Fix memory leak in ApnSettings-activity
Wink Saville [Tue, 28 Aug 2012 19:01:28 +0000 (12:01 -0700)]
Merge "Fix memory leak in ApnSettings-activity"
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:17:50 +0000 (11:17 -0700)]
am
72d3f85d: am
300457ba: am
38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
* commit '
72d3f85d09fd900004956b60e7e93997ba8b1025':
Enable to delete a stored persistent group from p2p settings.
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:15:22 +0000 (11:15 -0700)]
am
300457ba: am
38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
* commit '
300457bad289f547430da21e72747e8840840832':
Enable to delete a stored persistent group from p2p settings.
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:10:06 +0000 (11:10 -0700)]
am
38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
* commit '
38ce5194e89b83697466abe2994016507109ec54':
Enable to delete a stored persistent group from p2p settings.
Jean-Baptiste Queru [Tue, 28 Aug 2012 17:46:59 +0000 (10:46 -0700)]
Merge "Enable to delete a stored persistent group from p2p settings."
The Android Automerger [Tue, 28 Aug 2012 13:34:26 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Yoshihiko Ikenaga [Mon, 27 Aug 2012 13:10:05 +0000 (22:10 +0900)]
Enable to delete a stored persistent group from p2p settings.
Enable to delete a stored persistent group from p2p settings.
The multilingualization has NOT been done yet.
Change-Id: I84bd89343c9e3ce5e62b8b96dfce9d286675b145
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
Baligh Uddin [Mon, 27 Aug 2012 23:08:59 +0000 (16:08 -0700)]
am
8e891823: (-s ours) am
786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8e89182392e867b35729d01c4e3e45f5dff6d7f9':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 27 Aug 2012 23:06:17 +0000 (16:06 -0700)]
am
786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
786aacb79657a69f16840bff8b5862c6415d08bd':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 27 Aug 2012 23:03:30 +0000 (16:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev