OSDN Git Service
Baligh Uddin [Wed, 15 Aug 2012 14:46:00 +0000 (07:46 -0700)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 15 Aug 2012 04:55:20 +0000 (21:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c04327691d80c32adc4c7e9a5321be4ca53af68
Auto-generated-cl: translation import
Baligh Uddin [Tue, 14 Aug 2012 20:15:59 +0000 (13:15 -0700)]
am
a1754194: (-s ours) am
e62c9069: am
05e16515: (-s ours) am
cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
a17541940f6e6169956b8be3bf191eec06a8285d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 20:13:31 +0000 (13:13 -0700)]
am
e62c9069: am
05e16515: (-s ours) am
cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
e62c9069f6878cb23e7b2860e3f3ec67d47ad2e9':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 20:11:58 +0000 (13:11 -0700)]
am
05e16515: (-s ours) am
cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
05e16515399192130b738446a6c38374cf65e85b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 20:09:11 +0000 (13:09 -0700)]
am
cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
cb5624b80673e74f26d052f792dc8c9ce6e09a95':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 20:05:18 +0000 (13:05 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Baligh Uddin [Tue, 14 Aug 2012 19:58:11 +0000 (12:58 -0700)]
am
b3fab016: (-s ours) am
30e671bf: am
133c8ca5: (-s ours) am
c5acc132: Import translations. DO NOT MERGE
* commit '
b3fab0161b426716a2ac8a2e464923d46053eb00':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:57:04 +0000 (12:57 -0700)]
am
30e671bf: am
133c8ca5: (-s ours) am
c5acc132: Import translations. DO NOT MERGE
* commit '
30e671bfc9ffbfe1a00bf7be6cece5e0e7830b64':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:56:06 +0000 (12:56 -0700)]
am
133c8ca5: (-s ours) am
c5acc132: Import translations. DO NOT MERGE
* commit '
133c8ca599315c60bc8b30a4ac2020ceee02fc8e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:55:11 +0000 (12:55 -0700)]
am
c5acc132: Import translations. DO NOT MERGE
* commit '
c5acc132ca3de71c36cca1ebea2635396172ab4a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:53:14 +0000 (12:53 -0700)]
am
da5bb392: (-s ours) am
d97aad10: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
da5bb3929dcb224388f30c7d51aad7f0eea0a5d0':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:52:38 +0000 (12:52 -0700)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 14 Aug 2012 19:52:20 +0000 (12:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie305c33357a02ceb764477432909762f0eacec02
Auto-generated-cl: translation import
Baligh Uddin [Tue, 14 Aug 2012 19:50:53 +0000 (12:50 -0700)]
am
d97aad10: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
d97aad10be86e151832b759ead28fffc4d8aa2fa':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:49:34 +0000 (12:49 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 14 Aug 2012 19:48:45 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6675ea178a94e2a8b185f3cc5900e96de4f61c3d
Auto-generated-cl: translation import
Baligh Uddin [Tue, 14 Aug 2012 19:45:33 +0000 (12:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba3c413c6b912f21e0529b16159abf4e4427b14b
Auto-generated-cl: translation import
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:45:09 +0000 (08:45 -0700)]
am
f07797d8: am
b1f96237: am
291389ed: am
5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '
f07797d858abc701cce541f2a66761123b21b554':
Fix use of holo drawables in a few more places
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:43:14 +0000 (08:43 -0700)]
am
b1f96237: am
291389ed: am
5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '
b1f962377ec58f4e6dae3a7795d9113ed7306667':
Fix use of holo drawables in a few more places
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:41:17 +0000 (08:41 -0700)]
am
291389ed: am
5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '
291389ed5ce3c97c7f5ec145f00a6bc68862f8f4':
Fix use of holo drawables in a few more places
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:39:24 +0000 (08:39 -0700)]
am
5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '
5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba':
Fix use of holo drawables in a few more places
Przemyslaw Szczepaniak [Tue, 14 Aug 2012 15:33:56 +0000 (08:33 -0700)]
am
72529f17: am
ccd80ec9: Fix for setting TTS language to recently downloaded one
* commit '
72529f179b6ba1c0f0430f31d97dd4fedbbfbb11':
Fix for setting TTS language to recently downloaded one
Przemyslaw Szczepaniak [Tue, 14 Aug 2012 15:31:53 +0000 (08:31 -0700)]
am
ccd80ec9: Fix for setting TTS language to recently downloaded one
* commit '
ccd80ec95f035cb9db9775e6f86fea1f7809f168':
Fix for setting TTS language to recently downloaded one
Przemyslaw Szczepaniak [Mon, 13 Aug 2012 15:56:02 +0000 (16:56 +0100)]
Fix for setting TTS language to recently downloaded one
If user added new voice pack, then set it as a default language,
went level back and went to TTS settings again, it ended in crash.
This is because first updateVoiceDetails uses old voice data details
that settings retreived long time ago.
locales preference is hidden until TTs engine returns list of locales.
Change-Id: I33a81ff259c69adb4c051ee693b6c41b93f302d0
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:19:21 +0000 (08:19 -0700)]
Merge "Fix use of holo drawables in a few more places"
Björn Lundén [Mon, 13 Aug 2012 23:25:21 +0000 (01:25 +0200)]
Fix use of holo drawables in a few more places
Change-Id: Ie549ff14812da807729641fab1871fffe35f80b6
Jeff Sharkey [Mon, 13 Aug 2012 23:10:26 +0000 (16:10 -0700)]
am
adfa7fb2: am
1c7d15e8: am
865a914f: am
42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '
adfa7fb2a70f459de53a72b3c3ace9aee0a781c6':
Fix the issue the setting crashes after unmount SD card in landscape
Jeff Sharkey [Mon, 13 Aug 2012 23:10:24 +0000 (16:10 -0700)]
am
03bec5dc: am
d47a0d6c: am
677e2ff6: am
d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit '
03bec5dc1e1f236c33728ddc4ca42737c0a44f78':
Don't direct to market if no markets installed
Jean-Baptiste Queru [Mon, 13 Aug 2012 23:10:23 +0000 (16:10 -0700)]
am
463b501e: am
9e8e9a17: am
6fb425e2: am
eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '
463b501e6c50fb2312e83b520147af41b253dd8f':
Settings: Use ICS alert drawable
Jeff Sharkey [Mon, 13 Aug 2012 23:07:40 +0000 (16:07 -0700)]
am
1c7d15e8: am
865a914f: am
42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '
1c7d15e841a03a62c5c89f514970a8ce14069c2f':
Fix the issue the setting crashes after unmount SD card in landscape
Jeff Sharkey [Mon, 13 Aug 2012 23:07:39 +0000 (16:07 -0700)]
am
d47a0d6c: am
677e2ff6: am
d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit '
d47a0d6c51cc8529f7e4e7bfcbb4de139e339941':
Don't direct to market if no markets installed
Jean-Baptiste Queru [Mon, 13 Aug 2012 23:07:37 +0000 (16:07 -0700)]
am
9e8e9a17: am
6fb425e2: am
eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '
9e8e9a17836654f041f8c032e4f9c88341a63d4e':
Settings: Use ICS alert drawable
Jeff Sharkey [Mon, 13 Aug 2012 23:03:23 +0000 (16:03 -0700)]
am
865a914f: am
42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '
865a914fb5459dd5d6d676b11a09c95d15f2ef6e':
Fix the issue the setting crashes after unmount SD card in landscape
Jeff Sharkey [Mon, 13 Aug 2012 23:03:22 +0000 (16:03 -0700)]
am
677e2ff6: am
d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit '
677e2ff670eb48adf252e1bb9d1e2e5b3af558ee':
Don't direct to market if no markets installed
Jean-Baptiste Queru [Mon, 13 Aug 2012 23:03:15 +0000 (16:03 -0700)]
am
6fb425e2: am
eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '
6fb425e2805a1c27c048fc954d402f4612cbf74d':
Settings: Use ICS alert drawable
Baligh Uddin [Mon, 13 Aug 2012 22:49:23 +0000 (15:49 -0700)]
am
dd7857e2: (-s ours) am
70372dcf: Import translations. DO NOT MERGE
* commit '
dd7857e28f7f066d7e92e42ab607db612b5fc123':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 13 Aug 2012 22:46:48 +0000 (15:46 -0700)]
am
70372dcf: Import translations. DO NOT MERGE
* commit '
70372dcfc382c78c41013fa4d9e4a8bdcc7838ae':
Import translations. DO NOT MERGE
Jeff Sharkey [Mon, 13 Aug 2012 21:11:01 +0000 (14:11 -0700)]
am
42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '
42eb3fb2584b61aa27a4f89dd06817162f69fb3c':
Fix the issue the setting crashes after unmount SD card in landscape
Jeff Sharkey [Mon, 13 Aug 2012 21:11:00 +0000 (14:11 -0700)]
am
d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit '
d7db6baac7e7d6742916cf1f80e9cbf832b1c64d':
Don't direct to market if no markets installed
Baligh Uddin [Mon, 13 Aug 2012 20:30:49 +0000 (13:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I57cc82b205973c1de47c4d488742d799606dad02
Auto-generated-cl: translation import
Baligh Uddin [Mon, 13 Aug 2012 20:27:25 +0000 (13:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I98801e0b6cf3096a394a367ed93b49a2f7f851dc
Auto-generated-cl: translation import
Baligh Uddin [Mon, 13 Aug 2012 20:24:26 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7921607b000389e13db13a4a6e0b0014ec1e87a1
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 13 Aug 2012 20:17:12 +0000 (13:17 -0700)]
Merge "Fix the issue the setting crashes after unmount SD card in landscape"
Jeff Sharkey [Mon, 13 Aug 2012 20:14:08 +0000 (13:14 -0700)]
Merge "Don't direct to market if no markets installed"
Jean-Baptiste Queru [Mon, 13 Aug 2012 19:02:26 +0000 (12:02 -0700)]
am
eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '
eefa61ed2e8583f659e868f3057f195d7cb2bb11':
Settings: Use ICS alert drawable
Jean-Baptiste Queru [Mon, 13 Aug 2012 18:53:45 +0000 (11:53 -0700)]
Merge "Settings: Use ICS alert drawable"
Amith Yamasani [Sun, 12 Aug 2012 04:59:11 +0000 (21:59 -0700)]
am
032aa5a5: am
32630395: Use UserManager instead of PackageManager for user management
* commit '
032aa5a5ba22a5c46adc0fda210689c25e0e2bb5':
Use UserManager instead of PackageManager for user management
Amith Yamasani [Sun, 12 Aug 2012 04:57:51 +0000 (21:57 -0700)]
am
32630395: Use UserManager instead of PackageManager for user management
* commit '
32630395eb7dd8401f344599640c8bcf1e289bb0':
Use UserManager instead of PackageManager for user management
Amith Yamasani [Sat, 11 Aug 2012 02:31:39 +0000 (19:31 -0700)]
Use UserManager instead of PackageManager for user management
Show Accounts in secondary settings
Move Users & restrictions to Device section
Change-Id: Idcd7ed44801fe92c847cff81d11f3d6f6d06ba81
Baligh Uddin [Fri, 10 Aug 2012 22:38:44 +0000 (15:38 -0700)]
am
424111dd: (-s ours) am
5ef3293e: Import translations. DO NOT MERGE
* commit '
424111dd2a01337605b65c5ae7c67f19d18bc5e7':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 10 Aug 2012 22:36:48 +0000 (15:36 -0700)]
am
5ef3293e: Import translations. DO NOT MERGE
* commit '
5ef3293ed2bfd43e6a179121e6b562e56ced3feb':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 10 Aug 2012 22:34:31 +0000 (15:34 -0700)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 10 Aug 2012 18:24:00 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1bbf91bf64b56688b5772ae6d86d6aa0168f4d51
Auto-generated-cl: translation import
Baligh Uddin [Fri, 10 Aug 2012 18:21:05 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc7f0f0796b3cd9b46dc913083ea38c146feb086
Auto-generated-cl: translation import
The Android Open Source Project [Fri, 10 Aug 2012 15:55:54 +0000 (08:55 -0700)]
am
9698d362: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9698d3624c5e66cbff3c89e56a1388b6b2be9c1d':
The Android Open Source Project [Fri, 10 Aug 2012 15:53:55 +0000 (08:53 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I73e4c2917ac2df4341096582c1a1d1eab7df8a66
Przemyslaw Szczepaniak [Fri, 10 Aug 2012 14:18:23 +0000 (07:18 -0700)]
am
06649d02: am
923187a1: Keep speech rate dialog after rotate
* commit '
06649d02b2d6e3f147a1082c7538682f97e64a0b':
Keep speech rate dialog after rotate
Przemyslaw Szczepaniak [Fri, 10 Aug 2012 14:17:36 +0000 (07:17 -0700)]
am
923187a1: Keep speech rate dialog after rotate
* commit '
923187a159cb0c192a2f978a6bf1dd51275ea916':
Keep speech rate dialog after rotate
Przemyslaw Szczepaniak [Thu, 9 Aug 2012 11:50:41 +0000 (12:50 +0100)]
Keep speech rate dialog after rotate
It also adds some missing @Override
Bug:
5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693
Baligh Uddin [Fri, 10 Aug 2012 02:53:46 +0000 (19:53 -0700)]
am
2dc3d551: (-s ours) am
658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2dc3d551963426df9411fbc48db9f4112014d21b':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 10 Aug 2012 02:52:40 +0000 (19:52 -0700)]
am
658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
658f909d711b1598ec6f49447679569f0bc19c15':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 10 Aug 2012 02:50:14 +0000 (19:50 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Chuanxiao Dong [Tue, 24 Jul 2012 05:09:24 +0000 (13:09 +0800)]
Fix the issue the setting crashes after unmount SD card in landscape
When rotate the phone, mLastClickedMountToggle and mClickedMountPoint
would be destroied which made dialog access NULL pointer.
Change-Id: Ic96fce93828ca7a6f8749fad6a258eb47831e062
Author: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 26569
Baligh Uddin [Fri, 10 Aug 2012 02:49:10 +0000 (19:49 -0700)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Thu, 9 Aug 2012 23:06:33 +0000 (16:06 -0700)]
am
6a88ef4b: am
aae0659e: Setting to turn off power optimizations
* commit '
6a88ef4bd233591cfdd3cfa5cee9af61483242eb':
Setting to turn off power optimizations
Irfan Sheriff [Thu, 9 Aug 2012 22:58:13 +0000 (15:58 -0700)]
am
aae0659e: Setting to turn off power optimizations
* commit '
aae0659e18e013401b83717a83ec25393d4ba626':
Setting to turn off power optimizations
Irfan Sheriff [Thu, 9 Aug 2012 22:09:10 +0000 (15:09 -0700)]
Setting to turn off power optimizations
Bug:
5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
Baligh Uddin [Thu, 9 Aug 2012 19:42:04 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e16b50a8efca5da984acc9ad76d3bed76ee8d83
Auto-generated-cl: translation import
Baligh Uddin [Thu, 9 Aug 2012 19:39:18 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae1a278483147ad7497d207856bb9cf6a56a0bb1
Auto-generated-cl: translation import
The Android Automerger [Thu, 9 Aug 2012 16:29:59 +0000 (09:29 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
John Spurlock [Thu, 9 Aug 2012 13:22:56 +0000 (06:22 -0700)]
am
aeb7b571: am
eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
* commit '
aeb7b5710593b982d2306eb2006b6ae153655141':
Fix NPE in Dreams settings.
John Spurlock [Thu, 9 Aug 2012 13:20:50 +0000 (06:20 -0700)]
am
eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
* commit '
eaffad37c19ac5859539c232a7dc8d2f47159f61':
Fix NPE in Dreams settings.
John Spurlock [Thu, 9 Aug 2012 13:18:45 +0000 (06:18 -0700)]
Merge "Fix NPE in Dreams settings." into jb-mr1-dev
John Spurlock [Thu, 9 Aug 2012 13:03:48 +0000 (09:03 -0400)]
Fix NPE in Dreams settings.
Handle the null case to avoid crashing Settings.
Change-Id: I257b766370bd604e0af5b332241619258fb732c9
Baligh Uddin [Thu, 9 Aug 2012 03:05:51 +0000 (20:05 -0700)]
am
8aa63452: (-s ours) am
702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8aa634529cfeda5d375a2a541038b8b7976f8a85':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 9 Aug 2012 03:04:24 +0000 (20:04 -0700)]
am
702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
702cdf4c9a84fd9bcb258cdb26c57fd8d50961d6':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 9 Aug 2012 03:02:24 +0000 (20:02 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 9 Aug 2012 03:01:23 +0000 (20:01 -0700)]
Merge "Import translations. DO NOT MERGE"
Jean-Baptiste Queru [Wed, 8 Aug 2012 22:11:26 +0000 (15:11 -0700)]
am
17d915b7: am
66321184: am
75266364: am
5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '
17d915b7fdc4527710022ed3dd6c48bc03b8157b':
Add support for SE Android to the Settings app.
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:09:11 +0000 (14:09 -0700)]
am
66321184: am
75266364: am
5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '
66321184570da9e93c089b2a1065fc3d4c7230a3':
Add support for SE Android to the Settings app.
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:06:31 +0000 (14:06 -0700)]
am
75266364: am
5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '
7526636406087666d005d389ddc0cdacd79499fd':
Add support for SE Android to the Settings app.
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:11 +0000 (14:04 -0700)]
am
5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '
5d72b2726797374e402943182d8132045ed32d3a':
Add support for SE Android to the Settings app.
Baligh Uddin [Wed, 8 Aug 2012 20:44:29 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I036bc0a27767d78ad6cb86b255db7af28e9040d6
Auto-generated-cl: translation import
Baligh Uddin [Wed, 8 Aug 2012 20:40:29 +0000 (13:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a08f18c8f4ed45612e5491aa2b0ba2812373013
Auto-generated-cl: translation import
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:19:26 +0000 (13:19 -0700)]
Merge "Add support for SE Android to the Settings app."
The Android Open Source Project [Wed, 8 Aug 2012 15:21:52 +0000 (08:21 -0700)]
am
a01ab9e5: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a01ab9e5763b16e89239f40a56edfee5f0c8fa75':
The Android Open Source Project [Wed, 8 Aug 2012 15:18:04 +0000 (08:18 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I6809fcad464f90b62407ba5e19da9a226ca3be83
The Android Automerger [Wed, 8 Aug 2012 13:47:58 +0000 (06:47 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Matthew Xie [Wed, 8 Aug 2012 07:37:48 +0000 (00:37 -0700)]
am
83457dd7: am
a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
* commit '
83457dd79bb481afe9a1ad16259802b0a09fe68a':
Remove Profile Auto connection specific logic
Matthew Xie [Wed, 8 Aug 2012 07:35:29 +0000 (00:35 -0700)]
am
a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
* commit '
a1f463cb1930e806420844d4915def2dcfe7ae72':
Remove Profile Auto connection specific logic
Matthew Xie [Wed, 8 Aug 2012 07:33:38 +0000 (00:33 -0700)]
Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
Baligh Uddin [Tue, 7 Aug 2012 23:12:21 +0000 (16:12 -0700)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Tue, 7 Aug 2012 22:22:53 +0000 (15:22 -0700)]
am
422446e1: (-s ours) am
4325cf22: am
7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
422446e1ef8d42501a72800f81037ff142119f62':
Baligh Uddin [Tue, 7 Aug 2012 22:22:43 +0000 (15:22 -0700)]
am
eb2de9e8: (-s ours) am
6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
eb2de9e879489bc62adca6ea19c54836b77b7a6d':
Import translations. DO NOT MERGE
The Android Open Source Project [Tue, 7 Aug 2012 22:16:20 +0000 (15:16 -0700)]
am
4325cf22: am
7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
4325cf22ef3d381bc9d28d264571ba305da94d57':
The Android Open Source Project [Tue, 7 Aug 2012 22:14:14 +0000 (15:14 -0700)]
am
7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
7e107a0903707876c0ad7dd4ee2702fd5baed7ae':
The Android Open Source Project [Tue, 7 Aug 2012 21:59:46 +0000 (14:59 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5
Baligh Uddin [Tue, 7 Aug 2012 21:55:55 +0000 (14:55 -0700)]
am
6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
6ac8bae6a927c918391224277ff3c1524e7565a4':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Aug 2012 21:54:01 +0000 (14:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
OSDN Git Service
