git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Geoff Mendal [Mon, 9 Nov 2015 18:02:10 +0000 (18:02 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: f3b3a2ce2b  -s ours
am: 919b74ae35  -s ours

* commit '919b74ae355102deb2e6c35e95803edf29cea1d6':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 17:57:11 +0000 (17:57 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: f3b3a2ce2b -s ours

* commit 'f3b3a2ce2bc9b3f5eb6c96b7a828d245c84cc203':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 17:51:40 +0000 (17:51 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 17:43:57 +0000 (18:43 +0100)]

Import translations. DO NOT MERGE

Change-Id: I58434476f0ed8edce61cd6827f25842d2f546340
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 17:39:01 +0000 (17:39 +0000)]

Import translations. DO NOT MERGE am: 49eeda33dd  -s ours am: 0414438abe  -s ours
am: 9ab5fb52a0  -s ours

* commit '9ab5fb52a0d2d03b86a3862363f0594356a90bcd':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 17:34:42 +0000 (17:34 +0000)]

Import translations. DO NOT MERGE am: 49eeda33dd  -s ours
am: 0414438abe  -s ours

* commit '0414438abe0718f5007d7b580981d6ba204b655c':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 17:27:25 +0000 (17:27 +0000)]

Import translations. DO NOT MERGE
am: 49eeda33dd -s ours

* commit '49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 17:10:12 +0000 (18:10 +0100)]

Import translations. DO NOT MERGE

Change-Id: I664d6f94b74430f003182bc72db6610521883fa9
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 13:37:24 +0000 (13:37 +0000)]

Import translations. DO NOT MERGE am: 210f0afaf9  -s ours
am: a1d0738253  -s ours

* commit 'a1d07382539525a44baf0ca581e04fb445639831':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 13:29:12 +0000 (13:29 +0000)]

Import translations. DO NOT MERGE
am: 210f0afaf9 -s ours

* commit '210f0afaf9011d044d261f1044a1a7368cb89e7e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 9 Nov 2015 13:11:08 +0000 (05:11 -0800)]

Import translations. DO NOT MERGE

Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 22:23:00 +0000 (22:23 +0000)]

Merge "Support nested domain-config elements" am: 749501e88e
am: b549899d0b

* commit 'b549899d0b6b95032a9c75e64c9276acd85510d1':
Support nested domain-config elements

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 22:21:40 +0000 (22:21 +0000)]

Merge "Add xml source for network security configuration" am: ead46ecc84
am: 0cb8f01410

* commit '0cb8f014105b9e8e3bdb12cf091ef61e8c575333':
Add xml source for network security configuration

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 22:16:10 +0000 (22:16 +0000)]

Merge "Support nested domain-config elements"
am: 749501e88e

* commit '749501e88e5fa6bdc6594a9db5c232e31bdda867':
Support nested domain-config elements

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 22:14:36 +0000 (22:14 +0000)]

Merge "Add xml source for network security configuration"
am: ead46ecc84

* commit 'ead46ecc843e3686ff5ae8008f4452fc79f847e7':
Add xml source for network security configuration

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 22:11:04 +0000 (22:11 +0000)]

Merge "Support nested domain-config elements"

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 22:10:50 +0000 (22:10 +0000)]

Merge "Add xml source for network security configuration"

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 07:02:37 +0000 (23:02 -0800)]

Support nested domain-config elements

Nested domain-config inherit unset parameters from the domain-config
they are nested in. This helps avoid copy and pasted configs that are
almost the same except a few minor differences for a domain with
slightly different requirements.

For example: Consider a domain-config for example.com that, among other
settings, does not enforce hsts. Now if you want the rules for
example.com to apply to secure.example.com except that hsts _is_
enforced you can make a nested domain-config for secure.example.com
under example.com that sets hstsEnforced="true" and nothing else.

Change-Id: I9e33f7e62127fd7f4f15c3560fff2f2626477bd4

commit | commitdiff | tree

Chad Brubaker [Thu, 5 Nov 2015 07:55:29 +0000 (23:55 -0800)]

Add xml source for network security configuration

XmlConfigSource parses an ApplicationConfig from an xml resource.
Currently this supports app-wide default configuration via the
base-config element, per domain via the domain-config element and
inheritance of unset properties at parse time.

Inheritance of unset properties is currently only:
domain-config -> base-config -> platform default configuration
Where the most specific value is used.
For example: If the base-config specifies trust anchors, all connections
will use those anchors except for connections to a domain which has a
domain-config that specifies trust anchors, in which case the
domain-config's trust anchors will be used. If the domain-config or
base-config don't set trust anchors, or don't exist, then the platform
default trust anchors will be used.

Nested domain-config entries, debug-overrides, and thorough
documentation of the xml format will follow in later commits.

Change-Id: I1232ff1e8079a81b340bc12e142f0889f6947aa0

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 02:47:59 +0000 (02:47 +0000)]

Merge "Fix incorrect hstsEnforced lookup" am: 1347cb81f4
am: 90b9ed5c82

* commit '90b9ed5c82f5a3bd754bebe69a8883b65d3f95cc':
Fix incorrect hstsEnforced lookup

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 02:42:05 +0000 (02:42 +0000)]

Merge "Fix incorrect hstsEnforced lookup"
am: 1347cb81f4

* commit '1347cb81f402c628f3346ea350a5862749901d59':
Fix incorrect hstsEnforced lookup

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 02:37:45 +0000 (02:37 +0000)]

Merge "Fix incorrect hstsEnforced lookup"

commit | commitdiff | tree

Chad Brubaker [Sat, 7 Nov 2015 02:08:12 +0000 (18:08 -0800)]

Fix incorrect hstsEnforced lookup

Change-Id: I00364d8c1d3311bebd3ad88e557860e694ba5018

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 21:19:02 +0000 (21:19 +0000)]

Merge "Fix directory check in UserCertificateSource" am: 1483ee3aa5
am: 2d7d8401a9

* commit '2d7d8401a9c1e03f8f141415b25cfb415df73695':
Fix directory check in UserCertificateSource

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 21:17:34 +0000 (21:17 +0000)]

Merge "Fix incorrect hasPerDomainConfigs check" am: c5c51dafb3
am: dd6d0918c4

* commit 'dd6d0918c42aec3fb08d6df15822078e35cc4f33':
Fix incorrect hasPerDomainConfigs check

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 21:10:54 +0000 (21:10 +0000)]

Merge "Fix directory check in UserCertificateSource"
am: 1483ee3aa5

* commit '1483ee3aa5737f9aff06021b5ec9fe3086ee2e66':
Fix directory check in UserCertificateSource

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 21:09:11 +0000 (21:09 +0000)]

Merge "Fix incorrect hasPerDomainConfigs check"
am: c5c51dafb3

* commit 'c5c51dafb3ede95622eb350dae0b662abb611925':
Fix incorrect hasPerDomainConfigs check

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 21:02:23 +0000 (21:02 +0000)]

Merge "Fix directory check in UserCertificateSource"

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 21:02:01 +0000 (21:02 +0000)]

Merge "Fix incorrect hasPerDomainConfigs check"

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 20:52:12 +0000 (12:52 -0800)]

Fix directory check in UserCertificateSource

If the user has not added any CAs to the user trust store the user-added
directory will not have been created.

Change-Id: I8b5f73af3c0761c56969874231004fedbf7badda

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 20:50:31 +0000 (12:50 -0800)]

Fix incorrect hasPerDomainConfigs check

Change-Id: Iaeedbbcc5f12475d346a77dba84b38a1d3d8d346

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 20:31:02 +0000 (20:31 +0000)]

Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697
am: 478fad3cf5

* commit '478fad3cf53874f9cc96169cd25b29b9c031637a':
Use a builder for NetworkSecurityConfig

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 20:25:33 +0000 (20:25 +0000)]

Merge "Use a builder for NetworkSecurityConfig"
am: 7e98f2e697

* commit '7e98f2e6976fb38c5c3a7421547d1756ba5faafe':
Use a builder for NetworkSecurityConfig

commit | commitdiff | tree

Chad Brubaker [Fri, 6 Nov 2015 20:21:29 +0000 (20:21 +0000)]

Merge "Use a builder for NetworkSecurityConfig"

commit | commitdiff | tree

Chris Elliott [Fri, 6 Nov 2015 18:46:32 +0000 (18:46 +0000)]

DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours am: 634221adb2
am: 54919264d8

* commit '54919264d8ab758a29c6d417d7bcd5a949c0b6e9':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE

commit | commitdiff | tree

Chris Elliott [Fri, 6 Nov 2015 18:41:35 +0000 (18:41 +0000)]

DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours
am: 634221adb2

* commit '634221adb28f765233889cca32078e4b042198f3':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE

commit | commitdiff | tree

Chris Elliott [Fri, 6 Nov 2015 18:36:16 +0000 (18:36 +0000)]

DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
am: d9a2be8d3d -s ours

* commit 'd9a2be8d3d5bd0e170fec71c316373e268a8c17f':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE

commit | commitdiff | tree

Chris Elliott [Fri, 6 Nov 2015 17:41:17 +0000 (17:41 +0000)]

DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE

This reverts commit 7e19e286cc990daaafe934ed82ddfa00762907d6.

Change-Id: I808047efe13cdbf560d15e1ba081417e866ef83a

commit | commitdiff | tree

Svetoslav Ganov [Fri, 6 Nov 2015 00:46:35 +0000 (00:46 +0000)]

Merge "Take into account default app for default grants" am: 7abb36599d
am: 57fb4bd4f7

* commit '57fb4bd4f704c93ff73e055e6602ee18f7dbf669':
Take into account default app for default grants

commit | commitdiff | tree

Svetoslav Ganov [Fri, 6 Nov 2015 00:40:48 +0000 (00:40 +0000)]

Merge "Take into account default app for default grants"
am: 7abb36599d

* commit '7abb36599d9537296d9a51f766152025c6ed0491':
Take into account default app for default grants

commit | commitdiff | tree

Svetoslav Ganov [Fri, 6 Nov 2015 00:36:44 +0000 (00:36 +0000)]

Merge "Revert "Take into account default app for default grants"" am: 9ae3aeec53
am: 0c4ce4474f

* commit '0c4ce4474ff0020b2b041f26fb00efbdc0783285':
Revert "Take into account default app for default grants"

commit | commitdiff | tree

Svetoslav Ganov [Fri, 6 Nov 2015 00:34:21 +0000 (00:34 +0000)]

Merge "Take into account default app for default grants"

commit | commitdiff | tree

Svetoslav [Fri, 6 Nov 2015 00:33:02 +0000 (16:33 -0800)]

Take into account default app for default grants

Change-Id: Ib78c7dbda65d405bbf74544cad18e5e10bfcdeec

commit | commitdiff | tree

Svetoslav Ganov [Fri, 6 Nov 2015 00:31:13 +0000 (00:31 +0000)]

Merge "Revert "Take into account default app for default grants""
am: 9ae3aeec53

* commit '9ae3aeec532ce5a7908d395049efb61399875360':
Revert "Take into account default app for default grants"

commit | commitdiff | tree

Svetoslav Ganov [Fri, 6 Nov 2015 00:24:59 +0000 (00:24 +0000)]

Merge "Revert "Take into account default app for default grants""

commit | commitdiff | tree

Svetoslav Ganov [Fri, 6 Nov 2015 00:24:47 +0000 (00:24 +0000)]

Revert "Take into account default app for default grants"

Apparently OEMs can set the chooser so this patch is not enough since it assumes the chooser is a platform component.

This reverts commit fce33d58d87fd494686aae4e21332b58ec260b73.

Change-Id: I3b8e499d2f0a731a227d193f6c5d6ed528be2272

commit | commitdiff | tree

Tenghui Zhu [Fri, 6 Nov 2015 00:06:02 +0000 (00:06 +0000)]

Merge "When the incoming light source is invalid, don\'t generate any shadow" am: 3226c57321
am: cca2857ebb

* commit 'cca2857ebb52d3ba06bbd42de7db2c33e04cf0cc':
When the incoming light source is invalid, don't generate any shadow

commit | commitdiff | tree

Tenghui Zhu [Fri, 6 Nov 2015 00:00:33 +0000 (00:00 +0000)]

Merge "When the incoming light source is invalid, don\'t generate any shadow"
am: 3226c57321

* commit '3226c57321f15384ef7c1e93589c6d2a58cbe86c':
When the incoming light source is invalid, don't generate any shadow

commit | commitdiff | tree

Tenghui Zhu [Thu, 5 Nov 2015 23:56:56 +0000 (23:56 +0000)]

Merge "When the incoming light source is invalid, don't generate any shadow"

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 5 Nov 2015 00:57:53 +0000 (16:57 -0800)]

When the incoming light source is invalid, don't generate any shadow

b/25417885

Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507

commit | commitdiff | tree

Chad Brubaker [Thu, 5 Nov 2015 07:36:07 +0000 (23:36 -0800)]

Use a builder for NetworkSecurityConfig

The builder supports all the standard builder set* methods as well as
setting a parent builder to use when values are not set (recursively).
This allows us to have a level of inheretence in configurations without
complicating the lookup and trust checking logic by doing inheretence
when building the configs.

Change-Id: I054af83451e52761227479eadf9cb9803437505f

commit | commitdiff | tree

Chris Craik [Thu, 5 Nov 2015 20:37:23 +0000 (20:37 +0000)]

Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am: 0cf48e9120 am: 17fc83cbde
am: c06ccd77c1

* commit 'c06ccd77c129cdf198c64babdfd8d289aa8ff908':
Revert "Remove -ffast-math from libhwui makefile"

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Nov 2015 20:36:00 +0000 (20:36 +0000)]

Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am: e10faaa410 am: 2de7e39ffa
am: 73d60ff36f

* commit '73d60ff36fbf656d022c2d4f35b8e9f2d25e795f':
Kick movement preconditions onto handler thread.

commit | commitdiff | tree

Chris Craik [Thu, 5 Nov 2015 20:31:39 +0000 (20:31 +0000)]

Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am: 0cf48e9120
am: 17fc83cbde

* commit '17fc83cbde8ab1e92664d12a0fed306e9054ca55':
Revert "Remove -ffast-math from libhwui makefile"

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Nov 2015 20:30:12 +0000 (20:30 +0000)]

Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am: e10faaa410
am: 2de7e39ffa

* commit '2de7e39ffa387b370e5997542811fd05a73cb8fc':
Kick movement preconditions onto handler thread.

commit | commitdiff | tree

Tenghui Zhu [Thu, 5 Nov 2015 20:27:43 +0000 (20:27 +0000)]

Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c am: 1c7fbe0efb
am: d829ab7683

* commit 'd829ab76831a0c323f669385c54f666f8a91e4f1':
When the incoming light source is invalid, don't generate any shadow

commit | commitdiff | tree

Chris Craik [Thu, 5 Nov 2015 20:25:34 +0000 (20:25 +0000)]

Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev
am: 0cf48e9120

* commit '0cf48e9120fee8e5f0abc7b50a816bb2bc8e6127':
Revert "Remove -ffast-math from libhwui makefile"

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Nov 2015 20:23:46 +0000 (20:23 +0000)]

Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev
am: e10faaa410

* commit 'e10faaa41026863b9d0f7dd6b0c239ff79586dc7':
Kick movement preconditions onto handler thread.

commit | commitdiff | tree

Chris Craik [Thu, 5 Nov 2015 20:21:45 +0000 (20:21 +0000)]

Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev

commit | commitdiff | tree

Tenghui Zhu [Thu, 5 Nov 2015 20:20:29 +0000 (20:20 +0000)]

Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c
am: 1c7fbe0efb

* commit '1c7fbe0efbabe5c15ba72e16053551a8fdae1b92':
When the incoming light source is invalid, don't generate any shadow

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Nov 2015 20:17:13 +0000 (20:17 +0000)]

Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev

commit | commitdiff | tree

Joe LaPenna [Thu, 5 Nov 2015 20:16:12 +0000 (20:16 +0000)]

Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE am: 88c7c3e080  -s ours
am: efcb281bec  -s ours

* commit 'efcb281bec4a5ec57815204c89c5666ed35f3bcc':
  Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE

commit | commitdiff | tree

Tenghui Zhu [Thu, 5 Nov 2015 20:13:05 +0000 (20:13 +0000)]

Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev
am: 76d20b4a5c

* commit '76d20b4a5c6463235d9497b8018a38c059a6761c':
When the incoming light source is invalid, don't generate any shadow

commit | commitdiff | tree

Joe LaPenna [Thu, 5 Nov 2015 20:09:17 +0000 (20:09 +0000)]

Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
am: 88c7c3e080 -s ours

* commit '88c7c3e08051f4a2be8ee5194214678a07ff7f01':
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 20:07:40 +0000 (20:07 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 69cc50f1e8 -s ours

* commit '69cc50f1e881b80db9767ce7535fe58067ca4222':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 20:06:18 +0000 (20:06 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 97bf3b5922 -s ours

* commit '97bf3b5922df75ecf5cf8b13f9ba2f338acdaf82':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Tenghui Zhu [Thu, 5 Nov 2015 20:05:37 +0000 (20:05 +0000)]

Merge "When the incoming light source is invalid, don't generate any shadow" into mnc-dr-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 20:04:58 +0000 (20:04 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 5495ee8a9b -s ours

* commit '5495ee8a9bc44bb396a7bd2886d02ba7fe8ac711':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 20:03:32 +0000 (20:03 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 57b7fa49ac -s ours

* commit '57b7fa49ace8d715c471a3dc9af943b654ca09a3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 20:02:12 +0000 (20:02 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 6be193d87e -s ours

* commit '6be193d87e4d7e1d517c9066bd8e4e7579384980':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 20:01:03 +0000 (20:01 +0000)]

Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 20:00:34 +0000 (20:00 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 8019f49d08 -s ours

* commit '8019f49d0824b3027fcd8fa69d1bc9da64650d6f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:59:19 +0000 (19:59 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 8019f49d08 -s ours

* commit '8019f49d0824b3027fcd8fa69d1bc9da64650d6f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Joe LaPenna [Thu, 5 Nov 2015 19:26:47 +0000 (11:26 -0800)]

Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE

Also remove DEBUG-related timeout changes to have consistent behavior.

BUG: 24247417
BUG: 25463669
BUG: 23753686

Change-Id: Icfbb1531173477f2649f7f99e3bef9860e5a9ec2

commit | commitdiff | tree

Dan Albert [Thu, 5 Nov 2015 19:56:57 +0000 (19:56 +0000)]

Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
am: c74dd7fcb1

* commit 'c74dd7fcb128e9a1465c1a91a91a851c3386a955':
  Use std::unique_ptr instead of UniquePtr.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:55:32 +0000 (19:55 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: e1348a7fa9 -s ours

* commit 'e1348a7fa983099ccc387ee41ae1056571f33f51':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:54:07 +0000 (19:54 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 2523c61fb7 -s ours

* commit '2523c61fb78e9f6022b9762750842a65bcb224f3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:53:11 +0000 (19:53 +0000)]

Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:52:40 +0000 (19:52 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: cfd3d76b91 -s ours

* commit 'cfd3d76b9149baabf31339546e178b45cd44ca80':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:51:44 +0000 (19:51 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: cfd3d76b91 -s ours

* commit 'cfd3d76b9149baabf31339546e178b45cd44ca80':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:50:16 +0000 (19:50 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c138df954f -s ours

* commit 'c138df954f4ace40e722b9acbb2359d566da2147':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:49:59 +0000 (19:49 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:49:31 +0000 (19:49 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:49:27 +0000 (19:49 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:49:23 +0000 (19:49 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:49:19 +0000 (19:49 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:49:17 +0000 (19:49 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:48:50 +0000 (19:48 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: aa4dbe2d84 -s ours

* commit 'aa4dbe2d84e4b92843496586ce70ba0eacaf51ae':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:44:14 +0000 (19:44 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 70df552ac2 -s ours

* commit '70df552ac2a2154bae5f1420bfd8bbaa4dc08811':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:42:53 +0000 (19:42 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 31f0d18a03 -s ours

* commit '31f0d18a03115ba4a112af14fd007a2e9e7c4d72':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Dan Albert [Thu, 5 Nov 2015 19:41:33 +0000 (19:41 +0000)]

Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master

commit | commitdiff | tree

Dan Albert [Thu, 5 Nov 2015 19:40:59 +0000 (19:40 +0000)]

Merge "Use std::unique_ptr instead of UniquePtr."
am: 22b7e496c2

* commit '22b7e496c23c76b1f6d94e3ce99f39f9d3bca973':
Use std::unique_ptr instead of UniquePtr.

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:40:41 +0000 (19:40 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:40:25 +0000 (19:40 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:40:15 +0000 (19:40 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Nov 2015 19:40:04 +0000 (19:40 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master