OSDN Git Service
Philip P. Moltmann [Tue, 27 Oct 2015 19:56:48 +0000 (19:56 +0000)]
Merge "Deal with daylight savings time in battery chart."
Philip P. Moltmann [Tue, 27 Oct 2015 00:30:10 +0000 (17:30 -0700)]
Deal with daylight savings time in battery chart.
Without daylight saving time the middle between two beginnings of days
can only be another beginning of a day or noon. Due to daylight savings
time this can be shifted by up to one hour in either direction.
This change corrects the middle value.
Testing Done: Tried the calculation of the three values with Lisbon time
and
mStartWallTime = 1414254027000L;
mEndWallTime = 1414473627000L;
which spans over 10/26/2014, the day daylight saving ended in Lisbon.
Change-Id: I2d2ba6e1fd2e409ca3f6b0f7674ec250da7ffad5
Julia Reynolds [Tue, 27 Oct 2015 19:07:09 +0000 (19:07 +0000)]
Merge changes I3508c15a,I7b735ec0
* changes:
Always show rule creation option.
Remove some dead zen mode code.
Jorim Jaggi [Tue, 27 Oct 2015 09:54:53 +0000 (10:54 +0100)]
Add development option to force everything resizable
Bug:
24815256
Change-Id: Ic9620c3b502e92f1a628bbe696ae91896d25d5b3
Julia Reynolds [Tue, 27 Oct 2015 15:10:50 +0000 (11:10 -0400)]
Always show rule creation option.
Change-Id: I3508c15a0e9b727d7bc3dd63bd6482a623aaef5b
Julia Reynolds [Tue, 27 Oct 2015 12:40:47 +0000 (08:40 -0400)]
Remove some dead zen mode code.
Change-Id: I7b735ec0efff2a3758376d59e93df0e0e1530653
Geoff Mendal [Tue, 27 Oct 2015 04:51:06 +0000 (04:51 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours am:
884a8bbe78 -s ours am:
436fcc47fc -s ours
am:
80f2b5430e -s ours
* commit '
80f2b5430e3a448d9c818e33ceff9cd674ecbbda':
Import translations. DO NOT MERGE
Makoto Onuki [Mon, 26 Oct 2015 21:37:08 +0000 (21:37 +0000)]
Merge "Do not use UM.setUserRestrictions() in Settings"
Makoto Onuki [Thu, 15 Oct 2015 21:20:03 +0000 (14:20 -0700)]
Do not use UM.setUserRestrictions() in Settings
Change-Id: I014fe939f3495521a813eadbb7353956afc3feb4
Tony Mantler [Mon, 26 Oct 2015 18:39:14 +0000 (18:39 +0000)]
Merge "Move some app methods to AppUtils in SettingsLib"
Tony Mantler [Wed, 21 Oct 2015 18:30:10 +0000 (11:30 -0700)]
Move some app methods to AppUtils in SettingsLib
Change-Id: I1503e9d0e35c57aae32f90ff2c148cf1b75dcf05
Geoff Mendal [Mon, 26 Oct 2015 14:22:41 +0000 (14:22 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours am:
884a8bbe78 -s ours
am:
436fcc47fc -s ours
* commit '
436fcc47fce217f4c2b6301fe94fa87ffd6c0dbe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:17:02 +0000 (14:17 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours
am:
884a8bbe78 -s ours
* commit '
884a8bbe7872e8d7aa94f854e4057d2d073cd09a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:13:23 +0000 (14:13 +0000)]
Import translations. DO NOT MERGE
am:
c338bacb59 -s ours
* commit '
c338bacb59b13bed45239a587e3429b4bed00a71':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:03:05 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
Alan Viverette [Mon, 26 Oct 2015 14:01:18 +0000 (14:01 +0000)]
Merge "Let the framework handle long clicks"
Geoff Mendal [Mon, 26 Oct 2015 13:16:59 +0000 (06:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie5ca7c43f166e71719b8196efc96386f5f56241b
Auto-generated-cl: translation import
Alan Viverette [Fri, 23 Oct 2015 14:49:23 +0000 (10:49 -0400)]
Let the framework handle long clicks
If we manually propagate long click events, the framework can't include
coordinate information and we'll only be able to show a modal dialog.
Since the default long-click behavior is to show the context menu, just
let the framework handle it.
Bug:
25214386
Change-Id: I32e14b326ac91cc5a9c2bf7581325daaba34298e
Clara Bayarri [Fri, 16 Oct 2015 11:36:57 +0000 (12:36 +0100)]
Disable passphrase change flow encryption screen when not main user
When the user changing passphrase is not the process' user, disable
the "Ask for password on device startup" screen, as it makes no sense.
Change-Id: I521b5ec8702f7a39b94012a606794e04135e4c75
Clara Bayarri [Fri, 23 Oct 2015 10:13:37 +0000 (10:13 +0000)]
Merge "Refactor Choose/Confirm Lock flow to take user id"
Jason Monk [Thu, 22 Oct 2015 23:48:54 +0000 (23:48 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf am:
34d6ea560d am:
eccc9b3962
am:
652ba5e22e
* commit '
652ba5e22e86fe031ca080f5bfe032f27008989a':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:42:14 +0000 (23:42 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf am:
34d6ea560d
am:
eccc9b3962
* commit '
eccc9b39626c525763e5590728f413e4d7ff8cf5':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:37:48 +0000 (23:37 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf
am:
34d6ea560d
* commit '
34d6ea560d3935eef6e53e93d5bb7ba1a8148965':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:12:02 +0000 (23:12 +0000)]
Fix crash in Settings from uninstall
am:
6e2e8e17cf
* commit '
6e2e8e17cfea09548067baa8b361dbc31dce385c':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 22:32:08 +0000 (15:32 -0700)]
Fix crash in Settings from uninstall
Bug:
25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
Maurice Lam [Thu, 22 Oct 2015 19:52:05 +0000 (19:52 +0000)]
Merge "[WifiDialog] Allow adding unspecified AP"
Maurice Lam [Thu, 22 Oct 2015 18:39:26 +0000 (11:39 -0700)]
[WifiDialog] Allow adding unspecified AP
In WifiDialogActivity, handle the case where the given
accessPointState is null, and show the Wi-Fi dialog allowing users
to enter the SSID and other credentials. This will be used by setup
wizard when user selected "Add new network" item.
Bug:
23392285
Change-Id: Ica2650d9e829d73281bc9c504c3005d9c5750d31
Xiaohui Chen [Wed, 21 Oct 2015 21:49:49 +0000 (21:49 +0000)]
Merge "Clean up UserHandle.isOwner() in settings"
Xiaohui Chen [Wed, 21 Oct 2015 18:25:35 +0000 (11:25 -0700)]
Clean up UserHandle.isOwner() in settings
Bug:
24869636
Change-Id: I9cb05a7543024136935902047952f582ae57c07c
Geoff Mendal [Wed, 21 Oct 2015 16:52:58 +0000 (16:52 +0000)]
Import translations. DO NOT MERGE am:
a489856def -s ours am:
f3ad526200 -s ours am:
79e81bca9c -s ours
am:
af6440fb19 -s ours
* commit '
af6440fb1992cfc5a1f1c3127d98a72feb82a9f4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:47:13 +0000 (16:47 +0000)]
Import translations. DO NOT MERGE am:
a489856def -s ours am:
f3ad526200 -s ours
am:
79e81bca9c -s ours
* commit '
79e81bca9c11b35bbc4522fbe8117dc0b425ccc7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:59:01 +0000 (14:59 +0000)]
Import translations. DO NOT MERGE am:
a489856def -s ours
am:
f3ad526200 -s ours
* commit '
f3ad5262003947120243736851ff5dce7ae7635a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:48:15 +0000 (14:48 +0000)]
Import translations. DO NOT MERGE
am:
a489856def -s ours
* commit '
a489856def386e52f3507370f5b504841bab7a61':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:05:23 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 13:19:48 +0000 (06:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie184422a6bc4ead4e4ed8e32439a9b68168d35e4
Auto-generated-cl: translation import
Jason Monk [Wed, 21 Oct 2015 02:29:23 +0000 (02:29 +0000)]
Allow access to permissions, even if app has none am:
36866c8e84 am:
6fde534148 am:
47db2ba628
am:
4f9f28effb
* commit '
4f9f28effbce13e17c411016b00946070cc1ceeb':
Allow access to permissions, even if app has none
Jason Monk [Wed, 21 Oct 2015 02:20:21 +0000 (02:20 +0000)]
Allow access to permissions, even if app has none am:
36866c8e84 am:
6fde534148
am:
47db2ba628
* commit '
47db2ba62840135894cf139886c68e63a4497626':
Allow access to permissions, even if app has none
Jason Monk [Wed, 21 Oct 2015 01:46:11 +0000 (01:46 +0000)]
Allow access to permissions, even if app has none am:
36866c8e84
am:
6fde534148
* commit '
6fde534148c3f93b6362d4927270f81048a6bef3':
Allow access to permissions, even if app has none
Jason Monk [Wed, 21 Oct 2015 01:43:06 +0000 (01:43 +0000)]
Allow access to permissions, even if app has none
am:
36866c8e84
* commit '
36866c8e84acd26e82b072f2d39106d0e58e6a84':
Allow access to permissions, even if app has none
Jason Monk [Tue, 20 Oct 2015 23:38:58 +0000 (19:38 -0400)]
Allow access to permissions, even if app has none
Bug:
24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
Jeff Sharkey [Tue, 20 Oct 2015 23:14:42 +0000 (23:14 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp
am:
ead9448b4a
* commit '
ead9448b4a9284543e875115dde389444f2e2e3e':
Always show pairing dialog for device-specific keyboard.
Jeff Sharkey [Tue, 20 Oct 2015 23:14:32 +0000 (23:14 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6 am:
82839c8073 am:
0b07ce50a7
am:
6a4bd6f6f9
* commit '
6a4bd6f6f9882307bce087f8abe9bfafeda1680d':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 23:04:59 +0000 (16:04 -0700)]
resolve merge conflicts of
071352de9e to master.
Change-Id: Ib777927fd479fcb567d005910930fda7354865d0
Geoff Mendal [Tue, 20 Oct 2015 21:37:42 +0000 (21:37 +0000)]
Import translations. DO NOT MERGE am:
3a7368e9c3 -s ours am:
6bdaffa2af -s ours am:
275a235437 -s ours
am:
8da5906dcb -s ours
* commit '
8da5906dcb5b18f1e76cd1482a2dbbbd2de9fba6':
Import translations. DO NOT MERGE
Jason Monk [Tue, 20 Oct 2015 21:29:43 +0000 (14:29 -0700)]
resolve merge conflicts of
8e18934478 to master.
Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
Jeff Sharkey [Tue, 20 Oct 2015 18:34:46 +0000 (18:34 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp
Jeff Sharkey [Tue, 20 Oct 2015 18:34:40 +0000 (18:34 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6 am:
82839c8073
am:
0b07ce50a7
* commit '
0b07ce50a7e3069be81214559652ad2bf2191378':
Hide empty data usage cycles.
Michael Wright [Tue, 20 Oct 2015 18:34:24 +0000 (18:34 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev
am:
98ec49dd6c
* commit '
98ec49dd6c3105e342cf8e6c4fb5eb6168924b13':
Michael Wright [Tue, 20 Oct 2015 18:34:11 +0000 (18:34 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am:
66b6591d4c am:
6e957d6b42
am:
94a5587ed6
* commit '
94a5587ed664fa2e3996534d9ccf41394a1f131e':
Always show pairing dialog for device-specific keyboard.
Jeff Sharkey [Tue, 20 Oct 2015 18:32:34 +0000 (18:32 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6 am:
82839c8073
am:
0b07ce50a7
* commit '
0b07ce50a7e3069be81214559652ad2bf2191378':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 18:30:09 +0000 (18:30 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev am:
29b0ea2dbf am:
a8bd650e81
am:
10338550c4
* commit '
10338550c42421595896377f68545df1f8a93644':
Clamp large data usage values.
Michael Wright [Tue, 20 Oct 2015 17:54:53 +0000 (17:54 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev
Michael Wright [Tue, 20 Oct 2015 17:54:46 +0000 (17:54 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am:
66b6591d4c
am:
6e957d6b42
* commit '
6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
Always show pairing dialog for device-specific keyboard.
Michael Wright [Tue, 20 Oct 2015 17:54:29 +0000 (17:54 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am:
66b6591d4c
am:
6e957d6b42
* commit '
6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
Always show pairing dialog for device-specific keyboard.
Jeff Sharkey [Tue, 20 Oct 2015 17:49:25 +0000 (17:49 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6
am:
82839c8073
* commit '
82839c8073ff358e036c7ae54e52041e4a51738e':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 17:48:14 +0000 (17:48 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev am:
29b0ea2dbf
am:
a8bd650e81
* commit '
a8bd650e810178358251e3099f949af8422d5a24':
Clamp large data usage values.
Michael Wright [Tue, 20 Oct 2015 17:35:19 +0000 (17:35 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
am:
66b6591d4c
* commit '
66b6591d4c14400a18573a11880db16bb26ab80a':
Always show pairing dialog for device-specific keyboard.
Jeff Sharkey [Tue, 20 Oct 2015 17:33:50 +0000 (17:33 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev
am:
2fcbdb7bb6
* commit '
2fcbdb7bb677ed06ca5e3fbe558aff77259c194c':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 17:32:47 +0000 (17:32 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev
am:
29b0ea2dbf
* commit '
29b0ea2dbf8f0a31d02af8a4ce17753c9499b167':
Clamp large data usage values.
Michael Wright [Tue, 20 Oct 2015 17:23:40 +0000 (17:23 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:52 +0000 (17:21 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:43 +0000 (17:21 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev
Geoff Mendal [Tue, 20 Oct 2015 11:59:56 +0000 (11:59 +0000)]
Import translations. DO NOT MERGE am:
3a7368e9c3 -s ours am:
6bdaffa2af -s ours
am:
275a235437 -s ours
* commit '
275a235437c3dfe4824cd1ca36aff38c81fa46fb':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 11:56:07 +0000 (11:56 +0000)]
Import translations. DO NOT MERGE am:
3a7368e9c3 -s ours
am:
6bdaffa2af -s ours
* commit '
6bdaffa2af987725f54cae246b5ed694720213bb':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 11:52:42 +0000 (11:52 +0000)]
Import translations. DO NOT MERGE
am:
3a7368e9c3 -s ours
* commit '
3a7368e9c32af8c3245c8effc98de9e75f90f27a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 04:22:01 +0000 (21:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
Jason Monk [Tue, 20 Oct 2015 03:00:11 +0000 (03:00 +0000)]
Hide SIM and IMEI for wifi only devices am:
417a0500c3 am:
2a90c111ee
am:
554c3aef41
* commit '
554c3aef41c089d2baf6f2f6894de14e576f6d45':
Hide SIM and IMEI for wifi only devices
Jason Monk [Tue, 20 Oct 2015 02:22:55 +0000 (02:22 +0000)]
Hide SIM and IMEI for wifi only devices am:
417a0500c3
am:
2a90c111ee
* commit '
2a90c111ee994a0b8d95039b102ab280d6ce9d6b':
Hide SIM and IMEI for wifi only devices
Jason Monk [Tue, 20 Oct 2015 02:05:14 +0000 (02:05 +0000)]
Hide SIM and IMEI for wifi only devices
am:
417a0500c3
* commit '
417a0500c3d7e14013751dbe62791487b033ee72':
Hide SIM and IMEI for wifi only devices
Jeff Sharkey [Tue, 20 Oct 2015 00:22:05 +0000 (17:22 -0700)]
Hide empty data usage cycles.
When building list of historical data usage cycles, omit cycles
that don't contain any data usage. A bad NITZ or NTP fix may have
caused us to record some usage in 1970 or 2038, which would have
shown all the cycles in between. Now we hide empty cycles to keep
things clean.
Bug:
18282691
Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3
Jason Monk [Mon, 19 Oct 2015 23:48:15 +0000 (19:48 -0400)]
Hide SIM and IMEI for wifi only devices
Bug:
24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
Jeff Sharkey [Mon, 19 Oct 2015 23:41:53 +0000 (16:41 -0700)]
Clamp large data usage values.
Without clamping, they can wrap around to negative values and cause
all sorts of havok. 1TB ought to be enough for anyone: that's 3Mbps
for a solid month.
Bug:
24555152
Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8
Geoff Mendal [Mon, 19 Oct 2015 14:42:38 +0000 (14:42 +0000)]
am
edfdeeee: (-s ours) am
b2568ed0: (-s ours) am
35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
84c62dde3d -s ours
* commit '
edfdeeee309c19c553f5a5661d4070b5132995cf':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:38:55 +0000 (14:38 +0000)]
am
b2568ed0: (-s ours) am
35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
84c62dde3d -s ours
* commit '
b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:33:34 +0000 (14:33 +0000)]
am
35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
84c62dde3d -s ours
* commit '
35e01bf70f560c3651ae34968cd1082cb2dd8536':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:28:59 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
84c62dde3d -s ours
* commit '
84c62dde3d737e0cc194a24e76dbdac9e8c75170':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:27:20 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 14:25:38 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 13:40:02 +0000 (13:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 19 Oct 2015 13:39:34 +0000 (06:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5165b5d0fe4fc0cf9dff9ccf44fe1aa95db26628
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 13:21:41 +0000 (13:21 +0000)]
am
1c95645b: (-s ours) am
ca059bfb: (-s ours) am
51b43e12: (-s ours) am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE am:
862568de0d -s ours
* commit '
1c95645b3bbc55db50d5720e29a2b867d849d0f8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:17:46 +0000 (13:17 +0000)]
am
ca059bfb: (-s ours) am
51b43e12: (-s ours) am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE am:
862568de0d -s ours
* commit '
ca059bfb439df9db2c4ee2f7d860e8a29bf0a91f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:13:08 +0000 (13:13 +0000)]
am
51b43e12: (-s ours) am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE am:
862568de0d -s ours
* commit '
51b43e1236fa70711d914d0bc117a1ac745f0172':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:09:13 +0000 (13:09 +0000)]
am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE
am:
862568de0d -s ours
* commit '
862568de0d722af6f47e02b8c6fbf8efb9d6b6cc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:04:28 +0000 (13:04 +0000)]
am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
99131cf64253cf997d8ee6e356843e376a141846':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:01:28 +0000 (13:01 +0000)]
am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
f191953c77af3c5b78e576a430577aaf050aa5f1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 12:21:10 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
Julia Reynolds [Fri, 16 Oct 2015 19:29:39 +0000 (19:29 +0000)]
Merge "Update sorting for rule types and instances."
Maurice Lam [Fri, 16 Oct 2015 17:44:04 +0000 (17:44 +0000)]
Merge "Fix preferences v14 issues in lock screeen setup"
Jason Monk [Fri, 16 Oct 2015 16:56:40 +0000 (16:56 +0000)]
am
6d85d168: am
d2975f9d: am
d9774c9f: am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
6d85d1686e6a333fe990d9e3ae5b978e8a8ce8c2':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:49:38 +0000 (16:49 +0000)]
am
d2975f9d: am
d9774c9f: am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
d2975f9d0c12b46978c2a108961617293eeaba85':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:45:11 +0000 (16:45 +0000)]
am
d9774c9f: am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
d9774c9f5b4b5e0c51c03795cdc1658d1388ec87':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:41:22 +0000 (16:41 +0000)]
am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
cdcba9ce5f44cf4cad9e308919272db4e15e9717':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:33:56 +0000 (16:33 +0000)]
Merge "Fix crashes in Settings" into mnc-dr-dev
Jeff Sharkey [Fri, 16 Oct 2015 16:33:53 +0000 (16:33 +0000)]
am
bfee8b48: am
31e2ce0e: am
d36edb9f: am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
bfee8b484f3bb4807d185526058ea463f91f1091':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:29:54 +0000 (16:29 +0000)]
am
31e2ce0e: am
d36edb9f: am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:24:30 +0000 (16:24 +0000)]
am
d36edb9f: am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
d36edb9f462ee430d53515e02534e20d92e7a5d0':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:18:41 +0000 (16:18 +0000)]
am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
de005547bae3799265fdad8f61720a82241f4b07':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:14:47 +0000 (16:14 +0000)]
Merge "Bail if activity was destroyed." into mnc-dr-dev
Julia Reynolds [Wed, 14 Oct 2015 21:19:35 +0000 (17:19 -0400)]
Update sorting for rule types and instances.
Bug:
22977552
Change-Id: I671f45f156f8f3faa4ce55608dd1d61b9f07d16a
OSDN Git Service
