OSDN Git Service
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
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
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
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
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
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
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"
Svetoslav Ganov [Fri, 6 Nov 2015 00:34:21 +0000 (00:34 +0000)]
Merge "Take into account default app for default grants"
Svetoslav [Fri, 6 Nov 2015 00:33:02 +0000 (16:33 -0800)]
Take into account default app for default grants
Change-Id: Ib78c7dbda65d405bbf74544cad18e5e10bfcdeec
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"
Svetoslav Ganov [Fri, 6 Nov 2015 00:24:59 +0000 (00:24 +0000)]
Merge "Revert "Take into account default app for default grants""
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
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
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
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"
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
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"
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.
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"
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.
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
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"
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.
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
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
Jeff Sharkey [Thu, 5 Nov 2015 20:17:13 +0000 (20:17 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Baligh Uddin [Thu, 5 Nov 2015 19:49:59 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:31 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:27 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:23 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:19 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:17 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
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
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
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
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
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.
Baligh Uddin [Thu, 5 Nov 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:25 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:15 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:04 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:20 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:16 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:12 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:32:43 +0000 (19:32 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
Baligh Uddin [Thu, 5 Nov 2015 19:32:07 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:32:05 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Chad Brubaker [Thu, 5 Nov 2015 18:58:39 +0000 (18:58 +0000)]
Merge "Add initial network security config implementation" am:
8c35820720
am:
0bafbbfcb4
* commit '
0bafbbfcb4cbb6e6f20c0309f5c4242be83f18d7':
Add initial network security config implementation
Chad Brubaker [Thu, 5 Nov 2015 18:52:46 +0000 (18:52 +0000)]
Merge "Add initial network security config implementation"
am:
8c35820720
* commit '
8c358207206c5e19541c65e3f9761d1adb54550b':
Add initial network security config implementation
Brian Carlstrom [Thu, 5 Nov 2015 18:48:22 +0000 (18:48 +0000)]
Merge "Fixes for sm and pm usage" am:
ffb15da518
am:
671d5965f7
* commit '
671d5965f7b15ecba10453e8f445418dc0e730e6':
Fixes for sm and pm usage
Chad Brubaker [Thu, 5 Nov 2015 18:46:24 +0000 (18:46 +0000)]
Merge "Add initial network security config implementation"
Brian Carlstrom [Thu, 5 Nov 2015 18:42:53 +0000 (18:42 +0000)]
Merge "Fixes for sm and pm usage"
am:
ffb15da518
* commit '
ffb15da518e35727e218bfba48927902d4368e2f':
Fixes for sm and pm usage
Brian Carlstrom [Thu, 5 Nov 2015 18:38:56 +0000 (18:38 +0000)]
Merge "Fixes for sm and pm usage"
Brian Carlstrom [Thu, 5 Nov 2015 18:33:40 +0000 (10:33 -0800)]
Fixes for sm and pm usage
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"
Bug:
20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
Jeff Sharkey [Thu, 5 Nov 2015 18:00:05 +0000 (10:00 -0800)]
Kick movement preconditions onto handler thread.
The bulk of package moving already occurs on the handler thread,
but one of the precondition steps requires that we make an installd
call to calculate disk space of the app. If there was already
another long-running installd call going on, we could end up ANR'ing
the caller.
Since movePackage() is already designed to return a moveId and go
async, we can push all the precondition steps onto the handler thread
to prevent the ANR.
Bug:
25490003
Change-Id: I62d555c23bbf81b791f6f4cabc40c3d64c580cf8
Dan Albert [Thu, 5 Nov 2015 18:28:19 +0000 (18:28 +0000)]
Merge "Don\'t apply clang flag to gcc builds." am:
d9a1b35df6
am:
a41288b88f
* commit '
a41288b88f18273a61ed0af977408761598216cf':
Don't apply clang flag to gcc builds.
Dan Albert [Thu, 5 Nov 2015 18:22:57 +0000 (18:22 +0000)]
Merge "Don\'t apply clang flag to gcc builds."
am:
d9a1b35df6
* commit '
d9a1b35df62eddc56f69281aea1534d187b63205':
Don't apply clang flag to gcc builds.
Dan Albert [Thu, 5 Nov 2015 18:18:45 +0000 (18:18 +0000)]
Merge "Don't apply clang flag to gcc builds."
Chris Craik [Thu, 5 Nov 2015 17:58:28 +0000 (17:58 +0000)]
Revert "Remove -ffast-math from libhwui makefile"
This reverts commit
e02ec7c37a92fd63748a610bac6a23d0409788cf.
Change-Id: Iea7fadf04c4ffa62be28f783342ae749f89bf931
Deepanshu Gupta [Thu, 5 Nov 2015 17:24:38 +0000 (17:24 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev
am:
71093465ab
* commit '
71093465abbdf887c705b40fb0cb8a2919894c4b':
Fix Switch colors
Deepanshu Gupta [Thu, 5 Nov 2015 17:21:16 +0000 (17:21 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev
Deepanshu Gupta [Thu, 5 Nov 2015 01:49:16 +0000 (17:49 -0800)]
Fix Switch colors
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.
Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
Dan Albert [Thu, 5 Nov 2015 08:59:09 +0000 (00:59 -0800)]
Don't apply clang flag to gcc builds.
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).
Bug: http://b/
22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
Dan Albert [Thu, 5 Nov 2015 08:57:12 +0000 (00:57 -0800)]
Use std::unique_ptr instead of UniquePtr.
We're deprecating UniquePtr, so we need to move to the real thing.
Bug: http://b/
22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
Svetoslav Ganov [Thu, 5 Nov 2015 02:30:08 +0000 (02:30 +0000)]
Merge "Take into account default app for default grants" am:
82eeb2f20c
am:
0c7e9262a1
* commit '
0c7e9262a1cc89b748e281f330dd1ffecec6df3f':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 02:28:40 +0000 (02:28 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action" am:
035374d7a2
am:
a9b62e1330
* commit '
a9b62e13305d9cb43f53831f0b92d72bd490c1ae':
Enforce weaker grant if app is default handler for miltiple action
Svetoslav Ganov [Thu, 5 Nov 2015 02:25:32 +0000 (02:25 +0000)]
Merge "Take into account default app for default grants"
am:
82eeb2f20c
* commit '
82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
am:
035374d7a2
* commit '
035374d7a29b4e0b0bc71bdfb3555b2e547ce1da':
Enforce weaker grant if app is default handler for miltiple action
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:12 +0000 (02:19 +0000)]
Merge "Take into account default app for default grants"
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:00 +0000 (02:19 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
Svetoslav [Tue, 3 Nov 2015 02:40:18 +0000 (18:40 -0800)]
Enforce weaker grant if app is default handler for miltiple action
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
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
Baligh Uddin [Wed, 4 Nov 2015 23:59:57 +0000 (15:59 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I20cf8ac4a5039ead0a65bd2e38ded78542a7a3e8
Baligh Uddin [Wed, 4 Nov 2015 23:57:40 +0000 (15:57 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I924e59eeff537a0f66ae7ac7ace1dacd1f89f35e
Baligh Uddin [Wed, 4 Nov 2015 23:48:25 +0000 (15:48 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I200b933f68468a0e919d917ac93b33e4526bc1d0
Baligh Uddin [Wed, 4 Nov 2015 23:46:28 +0000 (15:46 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I44df802e45a340d7ef7f094c6c06001d350bb0c5
Baligh Uddin [Wed, 4 Nov 2015 23:44:21 +0000 (15:44 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I17d9389bfd2a83e57d20cb5de3e227cc34e09cbe
Baligh Uddin [Wed, 4 Nov 2015 23:39:05 +0000 (15:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I55bd76c512148127b06a36950cf66da55c9295dc
Baligh Uddin [Wed, 4 Nov 2015 23:36:55 +0000 (15:36 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I76a9ab65d1fe10e2915e5cd794a5cbce1697a933
Baligh Uddin [Wed, 4 Nov 2015 23:34:55 +0000 (15:34 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I924dde8b982ce94128882b484e9c3e9dc5c49013
OSDN Git Service
