OSDN Git Service
Julius D'souza [Sat, 22 Oct 2016 04:12:20 +0000 (04:12 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" am:
4fff94f1ed
am:
5f55007bc2 -s ours
Change-Id: I14131de322a6ff87369c01372531c30812ec22ed
Julius D'souza [Sat, 22 Oct 2016 04:04:22 +0000 (04:04 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
am:
4fff94f1ed
Change-Id: I3ce3d2b2af4be23fe9b57b907ef6db280543acbc
Robert Sesek [Sat, 22 Oct 2016 03:22:50 +0000 (03:22 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit." am:
8be2850546 am:
f80fab010a
am:
aa544e975e
Change-Id: I561fff0f56bdbfdeb6c92c11c3fce12cf3fe28be
Robert Sesek [Sat, 22 Oct 2016 03:17:15 +0000 (03:17 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit." am:
8be2850546
am:
f80fab010a
Change-Id: I37d0d62662ee96a9eefe2dfa71670d8e4b724889
Robert Sesek [Sat, 22 Oct 2016 03:12:18 +0000 (03:12 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am:
8be2850546
Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
Treehugger Robot [Sat, 22 Oct 2016 03:03:10 +0000 (03:03 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
Jason Monk [Sat, 22 Oct 2016 02:42:15 +0000 (02:42 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev am:
9db47b0f49 am:
e28705ac90
am:
7a12d75543
Change-Id: I293607cff0a3bab8653eeadf10a7c70da86656eb
Jason Monk [Sat, 22 Oct 2016 02:41:21 +0000 (02:41 +0000)]
Fix vpn branded string usage am:
59474a40af am:
ec421cd433
am:
7eef409c52
Change-Id: If1cefaf23db55037b421e5629a44ebf4c742cf4b
Jason Monk [Sat, 22 Oct 2016 02:37:21 +0000 (02:37 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev am:
9db47b0f49
am:
e28705ac90
Change-Id: I67337d3d11b2c21175ad64a2c841191b40127d78
Jason Monk [Sat, 22 Oct 2016 02:36:16 +0000 (02:36 +0000)]
Fix vpn branded string usage am:
59474a40af
am:
ec421cd433
Change-Id: I2dade8df4b700b244308e66d2d546b6d866a7260
Jason Monk [Sat, 22 Oct 2016 02:30:53 +0000 (02:30 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
am:
9db47b0f49
Change-Id: Ie3a6a3840bf047e8ba6126e563c93cba374b4d8e
Jason Monk [Sat, 22 Oct 2016 02:30:51 +0000 (02:30 +0000)]
Fix vpn branded string usage
am:
59474a40af
Change-Id: Ie6945d5978394024ae2f06edb29c38a18459e504
TreeHugger Robot [Sat, 22 Oct 2016 02:23:04 +0000 (02:23 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
Julius D'souza [Sat, 22 Oct 2016 02:21:01 +0000 (02:21 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
This reverts commit
637ae798ccd8762b6e53fcdfdf1aec6c3c8cf23a.
Change-Id: I1c7b449a2b13d5d3d956ac0570cb14b49c2e8b2c
TreeHugger Robot [Sat, 22 Oct 2016 01:22:32 +0000 (01:22 +0000)]
Merge "Use VR hal in VrManagerService."
TreeHugger Robot [Sat, 22 Oct 2016 00:37:16 +0000 (00:37 +0000)]
Merge "AAPT2: Ensure string pool ordering is compact"
Jeremy Joslin [Fri, 21 Oct 2016 23:47:35 +0000 (23:47 +0000)]
VPN network stat accounting changes. am:
3f0d75afe8 am:
0d309b7a47
am:
807102d7ff
Change-Id: I1edec6bf2a590f5b0ff010adfd6f2785a1aaa994
Jeremy Joslin [Fri, 21 Oct 2016 23:43:06 +0000 (23:43 +0000)]
VPN network stat accounting changes. am:
3f0d75afe8
am:
0d309b7a47
Change-Id: I797ac586581f83ada0e94639dd435122c987f1c1
Jeremy Joslin [Fri, 21 Oct 2016 23:37:57 +0000 (23:37 +0000)]
VPN network stat accounting changes.
am:
3f0d75afe8
Change-Id: I1c65db583cdd1d5b519830e521c633cb8dee449f
Jason Monk [Fri, 21 Oct 2016 23:27:34 +0000 (19:27 -0400)]
Fix vpn branded string usage
Change-Id: I42fdca60536425c757759414ac812b20e0b42823
Fixes:
32071681
Julius D'souza [Fri, 21 Oct 2016 22:43:16 +0000 (22:43 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev am:
a39e64eac2
am:
38405b69d2 -s ours
Change-Id: I85c746508e10e7b7b739587b7d9fce081d53ecca
Julius D'souza [Fri, 21 Oct 2016 22:42:09 +0000 (22:42 +0000)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze am:
637ae798cc
am:
0085ce0513 -s ours
Change-Id: Ibded7dd4f59a18ef3268d7c5f19074679392d234
Julius D'souza [Fri, 21 Oct 2016 22:37:04 +0000 (22:37 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
am:
a39e64eac2
Change-Id: I76a3334bd1464d9d8591f4bf1bbe369d90753d5e
Julius D'souza [Fri, 21 Oct 2016 22:36:58 +0000 (22:36 +0000)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
am:
637ae798cc
Change-Id: I3c2045d253a75d9afcf8771a503188c47d8de49d
Joe Onorato [Fri, 21 Oct 2016 22:32:32 +0000 (22:32 +0000)]
Merge "Another mac fix"
Joe Onorato [Fri, 21 Oct 2016 22:18:18 +0000 (15:18 -0700)]
Another mac fix
Test: make (on linux)
Change-Id: I3f0561f3a1fc08dad5d3dd8ba860da56b51d273c
Julius D'souza [Fri, 21 Oct 2016 22:29:33 +0000 (22:29 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
Julius D'souza [Fri, 21 Oct 2016 21:06:28 +0000 (14:06 -0700)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
Bug:
32169300
Change-Id: I60d23405eb38ec0625b5b7f739a84918f4632359
Christopher Ferris [Fri, 21 Oct 2016 22:22:59 +0000 (22:22 +0000)]
Merge "Fix mac build."
Siyamed Sinir [Fri, 21 Oct 2016 21:51:13 +0000 (21:51 +0000)]
Merge "Update TextView (set|get)(min|max)(width|height) ApiDoc"
Joe Onorato [Fri, 21 Oct 2016 21:35:40 +0000 (21:35 +0000)]
Merge "Fix mac build of bit"
Joe Onorato [Fri, 21 Oct 2016 21:31:42 +0000 (14:31 -0700)]
Fix mac build of bit
Test: make bit
Change-Id: I8005e77babfbe2d48806f9315800e699d1917bb4
Yin-Chia Yeh [Fri, 21 Oct 2016 21:28:30 +0000 (21:28 +0000)]
Merge "Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41 am:
50f9b6e71f" into nyc-mr1-dev-plus-aosp
am:
2979f63cd9
Change-Id: I20d62c7fa14424a208901c41e9eefe8c50f5b662
Yin-Chia Yeh [Fri, 21 Oct 2016 21:28:21 +0000 (21:28 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41 am:
50f9b6e71f
am:
0eb99d23b4
Change-Id: Ie8dbed22423aa52b418cebfd19e29c6ae2c6e2b5
Vinod Krishnan [Fri, 21 Oct 2016 21:27:02 +0000 (21:27 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev am:
088f73a9e9
am:
10f18d04ea
Change-Id: Idd82ceb9e1b6071072af95cf3e6cbe3ad80c31a7
Vinod Krishnan [Fri, 21 Oct 2016 21:21:18 +0000 (21:21 +0000)]
Fwk: Only chime when docked and accessbility is on am:
cf11ceab65
am:
ccf3baf6c5
Change-Id: I685dc2ef179087600e4d3c5776448ece338901b7
Michael Kwan [Fri, 21 Oct 2016 21:20:14 +0000 (21:20 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev am:
243e966892
am:
2dfe724d12
Change-Id: Icd813ed49f2d714666745265d49d22c2953656f7
Android Build Merger (Role) [Fri, 21 Oct 2016 21:19:31 +0000 (21:19 +0000)]
Merge "Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41 am:
50f9b6e71f" into nyc-mr1-dev-plus-aosp
Michael Kwan [Fri, 21 Oct 2016 21:19:02 +0000 (21:19 +0000)]
Fix improperly laid out alert dialog title to match UX specs. am:
9c86e68bfa
am:
35f5700178
Change-Id: I53d1f23f72c617f6a6a63436b8afbf9f6958b3e2
Yin-Chia Yeh [Fri, 21 Oct 2016 21:18:48 +0000 (21:18 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41
am:
50f9b6e71f
Change-Id: I1da99a15ab8ff08d3f9ccb0e9408990ad60ff279
Vinod Krishnan [Fri, 21 Oct 2016 21:17:48 +0000 (21:17 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
am:
088f73a9e9
Change-Id: Icbea8fbdefbf9979b72b7babac10e28a336d7d2f
Vinod Krishnan [Fri, 21 Oct 2016 21:14:19 +0000 (21:14 +0000)]
Fwk: Only chime when docked and accessbility is on
am:
cf11ceab65
Change-Id: Ief29ef6f325a8248843faa9fbe9ae6ff893a6918
Sergei Vasilinetc [Fri, 21 Oct 2016 21:11:46 +0000 (21:11 +0000)]
Merge changes I1d8a9a6e,I5adcd59d
* changes:
Use Bitmap in DisplayList & RecordedOps instead of SkBitmap Test: refactoring cl. bug:
32216791
Pass Bitmap instead of SkBitmap in drawNinePatch & drawBitmapMesh Test: refactoring cl. bug:
32216791
Michael Kwan [Fri, 21 Oct 2016 21:11:25 +0000 (21:11 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev
am:
243e966892
Change-Id: I9f3ae90d6ecce4c2944faad3f6f9b95642469935
Michael Kwan [Fri, 21 Oct 2016 21:11:17 +0000 (21:11 +0000)]
Fix improperly laid out alert dialog title to match UX specs.
am:
9c86e68bfa
Change-Id: I0989366635ebeb4af6ca63cc42c50913c2b7d32a
Yin-Chia Yeh [Fri, 21 Oct 2016 21:07:44 +0000 (21:07 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error"
am:
03f14bef41
Change-Id: If2e05eeb8c7fe24f97fc0c5e20bfe03a6c8c9e23
Adam Lesinski [Fri, 21 Oct 2016 20:38:42 +0000 (13:38 -0700)]
AAPT2: Ensure string pool ordering is compact
Keep styledstrings at the beginning of the StringPool
to reduce the padding in the StyledString array.
Bug:
32336940
Test: manual
Change-Id: Iec820c21a54daac40ecc3b2f87517a0f1efc9d3d
TreeHugger Robot [Fri, 21 Oct 2016 20:41:07 +0000 (20:41 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
Michael Kwan [Fri, 21 Oct 2016 20:38:02 +0000 (20:38 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev
Treehugger Robot [Fri, 21 Oct 2016 20:36:29 +0000 (20:36 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error"
Christopher Ferris [Fri, 21 Oct 2016 19:56:06 +0000 (12:56 -0700)]
Fix mac build.
Do not build the bit tool on darwin.
Test: Make sure this still builds on linux.
Change-Id: Ie958649893016771f1fa3df6f10d443d0117c171
TreeHugger Robot [Fri, 21 Oct 2016 19:22:47 +0000 (19:22 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
sergeyv [Fri, 21 Oct 2016 01:39:04 +0000 (18:39 -0700)]
Use Bitmap in DisplayList & RecordedOps instead of SkBitmap
Test: refactoring cl.
bug:
32216791
Change-Id: I1d8a9a6e772e2176b6c2409409a910478b45f8db
Wale Ogunwale [Fri, 21 Oct 2016 18:55:21 +0000 (18:55 +0000)]
Merge changes I26de316b,Iced72322,Iaa7f421d
* changes:
Removed WMS.getDefaultWindowListLocked()
Moved display related getting of orientation into DisplayContent
Have DisplayContent be the call point for adjusting wallpaper windows
TreeHugger Robot [Fri, 21 Oct 2016 18:53:47 +0000 (18:53 +0000)]
Merge "Removed WindowManagerService.getWindowListLocked()"
Yin-Chia Yeh [Wed, 19 Oct 2016 20:53:33 +0000 (13:53 -0700)]
Camera2 Legacy: catch more surface abandoned error
Bug:
30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db
TreeHugger Robot [Fri, 21 Oct 2016 18:37:39 +0000 (18:37 +0000)]
Merge "Fix broken KeyguardMessageArea"
Joe Onorato [Fri, 21 Oct 2016 17:55:42 +0000 (17:55 +0000)]
Merge changes from topic 'am_instrument'
* changes:
Add a new build, install, test development (bit) tool
am instrument gets protobuf
Fix bad type codes in streaming proto compiler
Erik Wolsheimer [Fri, 21 Oct 2016 17:46:06 +0000 (17:46 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev am:
653b982d18 -s ours
am:
7d81fa03fa -s ours
Change-Id: Ia014c890c267b4b3bf364ecfeea72892d8c11fba
Erik Wolsheimer [Fri, 21 Oct 2016 17:45:04 +0000 (17:45 +0000)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time am:
b608d28f84 -s ours
am:
b2e09827bd -s ours
Change-Id: Ibb370e2c7ce9f920760b6e56b5a0802466872f44
Erik Wolsheimer [Fri, 21 Oct 2016 17:37:05 +0000 (17:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
am:
653b982d18 -s ours
Change-Id: Icceb19699edb6db18091844d22516eff8ac7bc4d
Mathieu Chartier [Fri, 21 Oct 2016 17:36:59 +0000 (17:36 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo" am:
4a5789b9b1 am:
bb08c03048
am:
f822d0bc33
Change-Id: I28189f4d70c6b76e25db5e318855f3512755969e
Erik Wolsheimer [Fri, 21 Oct 2016 17:36:58 +0000 (17:36 +0000)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time
am:
b608d28f84 -s ours
Change-Id: Ic3d70afc2f07ee8ae3e09fbb0e010daebb199f21
Mathieu Chartier [Fri, 21 Oct 2016 17:28:55 +0000 (17:28 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo" am:
4a5789b9b1
am:
bb08c03048
Change-Id: I24dc9ea087f76ebb2130a4d4957f0600e189aed3
Vinod Krishnan [Fri, 21 Oct 2016 05:57:02 +0000 (22:57 -0700)]
Fwk: Only chime when docked and accessbility is on
Bug:
32036947
Change-Id: I5786abe827735cc3a4bc1d52baacaa19bccaae77
TreeHugger Robot [Fri, 21 Oct 2016 17:23:42 +0000 (17:23 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
Mathieu Chartier [Fri, 21 Oct 2016 17:20:27 +0000 (17:20 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
am:
4a5789b9b1
Change-Id: I3e50c0e6a80bc221228dd8293ec8209ecf323123
Mathieu Chartier [Thu, 20 Oct 2016 22:38:55 +0000 (15:38 -0700)]
Fix accounting for .vdex in dumpsys meminfo
Before it was showing up in "Other mmap" instead. Now it is correctly
showing up in ".dex mmap".
Bug:
30937355
Test: N6P booting, dumpsys meminfo -d
(cherry picked from commit
946ebbcc510acee5c166f2945075da65d8ae6ed3)
Change-Id: I49a202deda3fc34a94247825dc059b8a854ba61a
Mathieu Chartier [Fri, 21 Oct 2016 17:07:37 +0000 (17:07 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
Andrii Kulian [Fri, 21 Oct 2016 16:56:32 +0000 (16:56 +0000)]
Merge "Fix NPEs when display is added or removed"
Adrian Roos [Thu, 20 Oct 2016 22:34:23 +0000 (15:34 -0700)]
Fix broken KeyguardMessageArea
Fixes a bug where the keyguard message area would reorder clears
after a new message was set, leading to the bouncer prompt reason
not showing.
Change-Id: I33001300d9175c521809cd4fdae5158269245c00
Fixes:
32306174
Test: runtest -x $T/frameworks/base/packages/SystemUI/tests/src/com/android/keyguard/KeyguardMessageAreaTest.java
Erik Wolsheimer [Fri, 21 Oct 2016 04:09:44 +0000 (21:09 -0700)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time
BUG:
32172459
BUG:
32069897
Change-Id: I6f030b6288433b9cefce0f2fb1a69de61bfa7617
Wale Ogunwale [Fri, 21 Oct 2016 16:01:38 +0000 (09:01 -0700)]
Removed WMS.getDefaultWindowListLocked()
6th step in trying to make the WindowList private to DisplayContent.
The method was another an indirect way to the the window list
from the display content.
Test: Manual testing and existing tests pass.
Change-Id: I26de316b8c20dd891a214fb40ef3991a0e895442
Wale Ogunwale [Thu, 20 Oct 2016 22:29:42 +0000 (15:29 -0700)]
Moved display related getting of orientation into DisplayContent
5th step in trying to make WindowList private to DisplayContent.
Exact code to get orientation in WMS that is display specific
because it iterates over the window list into the DisplayContent
object.
Test: Manual testing and exiting test pass.
Change-Id: Iced72322cdebdde83882802af4a9decf323f20e1
Wale Ogunwale [Thu, 20 Oct 2016 17:16:29 +0000 (10:16 -0700)]
Have DisplayContent be the call point for adjusting wallpaper windows
4th step in trying to make the WindowList private to DisplayContent
Have the rest of the system call DisplayContent when they need to
adjust the position of the wallpaper windows in the window list
instead of calling WallpaperController directly. That way the display
content can control the window list that the wallpaper controller sees.
Test: Existing tests pass and manual testing.
Change-Id: Iaa7f421d7cd24d36e5a83e091f77b4a08d0ae123
Wale Ogunwale [Thu, 20 Oct 2016 16:31:56 +0000 (09:31 -0700)]
Removed WindowManagerService.getWindowListLocked()
3rd step in trying to make the WindowList private to DisplayContent.
The method was another an indirect way to the the window list
from the display content.
Test: Manual testing and existing tests pass.
Change-Id: Ifb0548a91b5bc64461e14f63256b61b8fa5e2e0c
Jeremy Joslin [Mon, 8 Aug 2016 23:07:37 +0000 (16:07 -0700)]
VPN network stat accounting changes.
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.
This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.
BUG:
30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
Jakub Adamek [Fri, 21 Oct 2016 09:35:45 +0000 (09:35 +0000)]
Add new color: accent with 60% opacity. am:
4f8b640bb7
am:
917d7d1a2d
Change-Id: I2a40035efbd15b8497a64d306e09d8e37301ea44
Jakub Adamek [Fri, 21 Oct 2016 09:27:35 +0000 (09:27 +0000)]
Add new color: accent with 60% opacity.
am:
4f8b640bb7
Change-Id: I59d23f030b6413f5cf3899d4a6b0daea7ff271c7
Jakub Adamek [Thu, 20 Oct 2016 08:45:38 +0000 (09:45 +0100)]
Add new color: accent with 60% opacity.
Bug:
32201256
Change-Id: Id09420b78941b59df2f248dd75994fb7275ec2ea
Jakub Adámek [Fri, 21 Oct 2016 08:09:42 +0000 (08:09 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev am:
42f40b159f
am:
6ba7dabc91
Change-Id: Ibf266357d7e96683f801660ad4cf538d002ec821
Jakub Adamek [Fri, 21 Oct 2016 08:08:39 +0000 (08:08 +0000)]
Fix idmap calls when a subdir is present. am:
56b9987ed7
am:
47c7e1e9f9
Change-Id: I30a8a7531080bd52145219f62133e78198eb1006
Jakub Adámek [Fri, 21 Oct 2016 07:58:34 +0000 (07:58 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev
am:
42f40b159f
Change-Id: I8370a4d376a02c8a16bdb1ebe5ff58a20ca0989b
Jakub Adamek [Fri, 21 Oct 2016 07:58:26 +0000 (07:58 +0000)]
Fix idmap calls when a subdir is present.
am:
56b9987ed7
Change-Id: Ia58f447ec6bf3b63e2922b02a794f487ec9679d0
Jakub Adámek [Fri, 21 Oct 2016 07:51:17 +0000 (07:51 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev
Jakub Adamek [Thu, 20 Oct 2016 14:07:57 +0000 (15:07 +0100)]
Fix idmap calls when a subdir is present.
We need to increase the size of argv so that the last one remains
a NULL.
Bug:
32202741
Change-Id: I6636b5401fa7a61686a48c9a99b3e54e596033f9
Flavio Lerda [Fri, 21 Oct 2016 07:19:47 +0000 (07:19 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev am:
327dbfb94f
am:
1a10780c6b
Change-Id: Id7db030eb7b76e84ee6c0236e55e796f5fb00cf4
Jakub Adamek [Fri, 21 Oct 2016 07:16:07 +0000 (07:16 +0000)]
Change name of overlay subdir 'sku'->'theme' am:
54dcaaba4f
am:
6bbb63ad91
Change-Id: I71dfaafbebaa7bd61d182405c734eef1ea7ff1eb
Flavio Lerda [Fri, 21 Oct 2016 07:09:27 +0000 (07:09 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
am:
327dbfb94f
Change-Id: I33e92132b4422726928531da8be7a444cbd2fd64
Jakub Adamek [Fri, 21 Oct 2016 07:05:17 +0000 (07:05 +0000)]
Change name of overlay subdir 'sku'->'theme'
am:
54dcaaba4f
Change-Id: I4536de644c20171e175cddaff0cd041fb05b3038
Flavio Lerda [Fri, 21 Oct 2016 06:32:18 +0000 (06:32 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
liulvping [Fri, 21 Oct 2016 04:58:43 +0000 (04:58 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig" am:
e6fe836938 am:
0046acc2db
am:
78b29d52e0
Change-Id: Ic780ee41444f3b335339d5bfe418ce2738785ea7
Brad Ebinger [Fri, 21 Oct 2016 04:55:19 +0000 (04:55 +0000)]
Merge "Switch on android.telecom.Log in Telecom" am:
37521b9ba5 -s ours am:
ce21e3ffa8
am:
0fcc717ed9
Change-Id: I0d03c1dccfee9ffe7b8c6f44f6bdbfb876c11d21
Brad Ebinger [Fri, 21 Oct 2016 04:53:57 +0000 (04:53 +0000)]
Switch on android.telecom.Log in Telecom am:
ce97bfbdb2
am:
7ed42a72c0
Change-Id: I8adb58d243f2e674ec031584356496a754b21cf8
liulvping [Fri, 21 Oct 2016 04:46:50 +0000 (04:46 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig" am:
e6fe836938
am:
0046acc2db
Change-Id: Iff046d5f35c34a425e4765a69700d09d6834b16f
Brad Ebinger [Fri, 21 Oct 2016 04:45:47 +0000 (04:45 +0000)]
Merge "Switch on android.telecom.Log in Telecom" am:
37521b9ba5 -s ours
am:
ce21e3ffa8
Change-Id: I64e18346d869594db31f3e7fa3154bb9198a3790
liulvping [Fri, 21 Oct 2016 04:38:38 +0000 (04:38 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
am:
e6fe836938
Change-Id: I4eda1d6aed52fa4d8cbcd1ade29e96f14e58bab7
Brad Ebinger [Fri, 21 Oct 2016 04:37:28 +0000 (04:37 +0000)]
Merge "Switch on android.telecom.Log in Telecom"
am:
37521b9ba5 -s ours
Change-Id: I1a624721f577be6b1cf684208cdeb4e0471e51f2
Brad Ebinger [Fri, 21 Oct 2016 04:37:22 +0000 (04:37 +0000)]
Switch on android.telecom.Log in Telecom
am:
ce97bfbdb2
Change-Id: Ic7827f1627eca43937609e21d15186f483381182
Hugo Benichi [Fri, 21 Oct 2016 04:35:48 +0000 (04:35 +0000)]
Merge "IpConnectivity metrics: add version number"