OSDN Git Service
Colin Cross [Fri, 16 Dec 2016 09:13:54 +0000 (09:13 +0000)]
Move libandroid_runtime headers into frameworks/base/core/jni am:
71044fe7e5 am:
7f63febbc4
am:
b1a3ae1f54
Change-Id: I485c242afcdfdfa3148475b10eab3ff547f453d4
Ruben Brunk [Fri, 16 Dec 2016 09:06:00 +0000 (09:06 +0000)]
Merge "Don't call into VrManagerService with AM lock." into nyc-mr2-dev
am:
2bfb3155d9
Change-Id: Iea925a8edd6485fada6c3ed06accd07f5284b567
Colin Cross [Fri, 16 Dec 2016 09:05:54 +0000 (09:05 +0000)]
Move libandroid_runtime headers into frameworks/base/core/jni am:
71044fe7e5
am:
7f63febbc4
Change-Id: I81b1c89c85ff779509309a83efc16dc140f4a08f
Ruben Brunk [Fri, 16 Dec 2016 09:05:54 +0000 (09:05 +0000)]
Don't call into VrManagerService with AM lock.
am:
27b53cfe88
Change-Id: I9670487f160e9ef2af6b8da250943c7ad4749e5d
Colin Cross [Fri, 16 Dec 2016 08:57:51 +0000 (08:57 +0000)]
Move libandroid_runtime headers into frameworks/base/core/jni
am:
71044fe7e5
Change-Id: I70e7c0ca02a2783ab2c32a9d067ba75092fd81c6
TreeHugger Robot [Fri, 16 Dec 2016 08:53:54 +0000 (08:53 +0000)]
Merge "Don't call into VrManagerService with AM lock." into nyc-mr2-dev
Android Build Merger (Role) [Fri, 16 Dec 2016 05:16:17 +0000 (05:16 +0000)]
Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am:
7b22d549d4 am:
b825c71446 am:
ad7fe271ae" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 16 Dec 2016 05:16:01 +0000 (05:16 +0000)]
Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am:
7b22d549d4 am:
b825c71446 am:
db8fdee7a4" into nyc-mr2-dev-plus-aosp
Mark Lu [Fri, 16 Dec 2016 05:15:38 +0000 (05:15 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am:
7b22d549d4 am:
b825c71446
am:
ad7fe271ae
Change-Id: Ie01aba0ba90a72d78fd53c70586d991a6695761e
Mark Lu [Fri, 16 Dec 2016 05:15:28 +0000 (05:15 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am:
7b22d549d4 am:
b825c71446
am:
db8fdee7a4
Change-Id: I499caec2bfd9544ad2c0a6e715a8d2358239abfb
Android Build Merger (Role) [Fri, 16 Dec 2016 05:15:12 +0000 (05:15 +0000)]
Merge "docs: changes to broadcast documentation am:
33ec106d22 am:
377dab8ab3 am:
1c5a117342" into nyc-mr2-dev-plus-aosp
Mark Lu [Fri, 16 Dec 2016 05:14:40 +0000 (05:14 +0000)]
docs: changes to broadcast documentation am:
33ec106d22 am:
377dab8ab3
am:
1c5a117342
Change-Id: I84b0410fcef3bea08c5636927864298d30989308
Mark Lu [Fri, 16 Dec 2016 05:14:34 +0000 (05:14 +0000)]
docs: changes to broadcast documentation am:
33ec106d22 am:
377dab8ab3
am:
fd737791e8
Change-Id: I18b47ba01b0af8882c25526d8823f263f456aae2
Mark Lu [Fri, 16 Dec 2016 05:07:35 +0000 (05:07 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am:
7b22d549d4
am:
b825c71446
Change-Id: I08459d58e96cffebedb1fbe034c4c36acec1c0c0
Mark Lu [Fri, 16 Dec 2016 05:07:28 +0000 (05:07 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am:
7b22d549d4
am:
b825c71446
Change-Id: I3bf4c7726b5221f7013e2df35d007f30e24dba17
Mark Lu [Fri, 16 Dec 2016 05:06:42 +0000 (05:06 +0000)]
docs: changes to broadcast documentation am:
33ec106d22
am:
377dab8ab3
Change-Id: I2e8377b188ce6a10ea633e089c3a20f9ef7908fd
Mark Lu [Fri, 16 Dec 2016 05:06:37 +0000 (05:06 +0000)]
docs: changes to broadcast documentation am:
33ec106d22
am:
377dab8ab3
Change-Id: I7dcb1bc57fb62f2b177c7ad15a9236da98fb749f
Mark Lu [Fri, 16 Dec 2016 04:59:10 +0000 (04:59 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev
am:
7b22d549d4
Change-Id: I41ac74d65f48258c21afcbd39bf1eb518976a5f2
Mark Lu [Fri, 16 Dec 2016 04:59:08 +0000 (04:59 +0000)]
docs: changes to broadcast documentation
am:
33ec106d22
Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987
Ruben Brunk [Fri, 16 Dec 2016 01:55:40 +0000 (17:55 -0800)]
Don't call into VrManagerService with AM lock.
Bug:
33655854
Merged-In: If777e0ef40b29bff42722f2aa10cff86a5831bc0
Change-Id: I365d0033cf20172cee57b0ef2a53dd8648640c8d
Mark Lu [Fri, 16 Dec 2016 04:48:36 +0000 (04:48 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev
Tamas Berghammer [Fri, 16 Dec 2016 01:46:39 +0000 (01:46 +0000)]
Merge "Install all files from the lib directory for debuggable apps" am:
c0cc7c646c am:
736852e2c4
am:
db274f7859
Change-Id: I4bd6e3da9c41fcfb9a5d8f39c63da446515fc9ff
Adrian Roos [Fri, 16 Dec 2016 01:42:10 +0000 (01:42 +0000)]
Merge "Assist app is not launched when long-pressing on Home key" am:
1e41bb4887 am:
d81fde40ef
am:
272c84b5be
Change-Id: I26c24879b6fb013ac477eb649d97d0411fd0da46
Tamas Berghammer [Fri, 16 Dec 2016 01:21:31 +0000 (01:21 +0000)]
Merge "Install all files from the lib directory for debuggable apps" am:
c0cc7c646c
am:
736852e2c4
Change-Id: I0faa3ab541ca8d1400719653171b4bcafceada81
Adrian Roos [Fri, 16 Dec 2016 01:20:12 +0000 (01:20 +0000)]
Merge "Assist app is not launched when long-pressing on Home key" am:
1e41bb4887
am:
d81fde40ef
Change-Id: Ia8f58cfa1945a7ad627889545a264c9d1fb06beb
Tamas Berghammer [Fri, 16 Dec 2016 00:48:21 +0000 (00:48 +0000)]
Merge "Install all files from the lib directory for debuggable apps"
am:
c0cc7c646c
Change-Id: Idc3b17fa4044ab0dd50fa141f1ec5ec8a47810b0
Treehugger Robot [Fri, 16 Dec 2016 00:35:54 +0000 (00:35 +0000)]
Merge "Install all files from the lib directory for debuggable apps"
Adrian Roos [Fri, 16 Dec 2016 00:01:24 +0000 (00:01 +0000)]
Merge "Assist app is not launched when long-pressing on Home key"
am:
1e41bb4887
Change-Id: I3d88e9116c45cec013c4b7a3bb3f53480f0f2af6
Adrian Roos [Thu, 15 Dec 2016 23:51:11 +0000 (23:51 +0000)]
Merge "Assist app is not launched when long-pressing on Home key"
Shinji Sogo [Thu, 15 Dec 2016 23:38:59 +0000 (23:38 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID" am:
69e7f9683d am:
e67395a97a
am:
80fba49386
Change-Id: I15cabf9e4146f1f0d0c31b24d222c34b8477cdb7
Hall Liu [Thu, 15 Dec 2016 23:07:04 +0000 (23:07 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev
am:
e6d5a19e5f
Change-Id: Ifb5c7df88ad6191dfbfeda29b9b5fed97a32e530
Wei Huang [Thu, 15 Dec 2016 23:06:53 +0000 (23:06 +0000)]
Adds carrier config to determine if high definition audio is displayed
am:
f84a966106
Change-Id: I030077b8f9a8fa9f05d1a71f051cd19059c54bab
Shinji Sogo [Thu, 15 Dec 2016 23:04:21 +0000 (23:04 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID" am:
69e7f9683d
am:
e67395a97a
Change-Id: Idff19dcb2c95c4f8b359863fe8545fc478040723
Hall Liu [Thu, 15 Dec 2016 22:41:34 +0000 (22:41 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev
Adrian Roos [Thu, 15 Dec 2016 22:37:11 +0000 (22:37 +0000)]
Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev
am:
23c46fb117
Change-Id: Idb6278c0b74c0308e77eab33c2c4cb503d93c123
Adrian Roos [Thu, 15 Dec 2016 22:37:00 +0000 (22:37 +0000)]
DirectReply: Show bouncer when occluded
am:
f37fce5182
Change-Id: Ib3f82893fe744a3d382841e17e5a8e8dc1c3c19b
Shinji Sogo [Thu, 15 Dec 2016 22:32:03 +0000 (22:32 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
am:
69e7f9683d
Change-Id: I7ce35b895d24b013169aa30b794fb524bac09990
Adrian Roos [Thu, 15 Dec 2016 22:22:53 +0000 (22:22 +0000)]
Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev
Treehugger Robot [Thu, 15 Dec 2016 22:17:47 +0000 (22:17 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
Michael Kwan [Thu, 15 Dec 2016 21:31:48 +0000 (21:31 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am:
738fb65657
am:
106821edfe
Change-Id: I22a94a690862e5456d17e0e2ccd9f62ac9851240
Michael Kwan [Thu, 15 Dec 2016 21:30:42 +0000 (21:30 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures. am:
8a9b27773b
am:
3707030cf5
Change-Id: Ia856a0b54eebc6821fff47cd90f05d73f49fdefd
Michael Kwan [Thu, 15 Dec 2016 21:24:55 +0000 (21:24 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am:
738fb65657
am:
a14aa31ef5
Change-Id: I4ae6d6728c607c985943bce7e4f241c006878f8b
Michael Kwan [Thu, 15 Dec 2016 21:23:44 +0000 (21:23 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures. am:
8a9b27773b
am:
4308eaa477
Change-Id: Id5fa0c8bd66ca7970c971884c1067aca4ac24124
Michael Kwan [Thu, 15 Dec 2016 21:16:19 +0000 (21:16 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
am:
738fb65657
Change-Id: Ica017f0a0490c522777f20e38b7db16872ccc615
Michael Kwan [Thu, 15 Dec 2016 21:16:15 +0000 (21:16 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures.
am:
8a9b27773b
Change-Id: If7040c0f1cc71edcc16021b4825fb5d1d6fbdecf
Michael Kwan [Thu, 15 Dec 2016 21:16:08 +0000 (21:16 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
am:
738fb65657
Change-Id: Ib2ab0dc43370d8387a56f2e3b3e3d50d44d7b772
Michael Kwan [Thu, 15 Dec 2016 21:16:05 +0000 (21:16 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures.
am:
8a9b27773b
Change-Id: I2b25052c22b5f50f95d0365eff4e3b2e27625b7f
Michael Kwan [Thu, 15 Dec 2016 21:09:53 +0000 (21:09 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
Martijn Coenen [Thu, 15 Dec 2016 20:55:49 +0000 (20:55 +0000)]
Merge "HwBinder: Remove use of IHw class." am:
11ec22ab2a am:
df296fe1fa
am:
370815ef62
Change-Id: I9a6b8dc6cf2e4c9d424c34513129d965155a0df7
dcashman [Thu, 15 Dec 2016 20:54:50 +0000 (20:54 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components." am:
a1c9c860a9 am:
455202b9db
am:
33d3d19235
Change-Id: I4c60853dc695943d1c9374ab5e1cc8af995de154
dcashman [Thu, 15 Dec 2016 20:48:20 +0000 (20:48 +0000)]
Split mac_permissions.xml into plat and non-plat components. am:
b1cc4f8ca4 am:
2a7ce100b7
am:
46d6966f43
Change-Id: I99def3496b5319c2dd717b02fe28d9c691b47880
Martijn Coenen [Thu, 15 Dec 2016 20:47:05 +0000 (20:47 +0000)]
Merge "HwBinder: Remove use of IHw class." am:
11ec22ab2a
am:
df296fe1fa
Change-Id: I1c1069b5d2c1452f1cc9ee33725c3fa8f541966c
dcashman [Thu, 15 Dec 2016 20:45:55 +0000 (20:45 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components." am:
a1c9c860a9
am:
455202b9db
Change-Id: I2a314f827db34cc92058729629d9000526b43027
dcashman [Thu, 15 Dec 2016 20:41:14 +0000 (20:41 +0000)]
Split mac_permissions.xml into plat and non-plat components. am:
b1cc4f8ca4
am:
2a7ce100b7
Change-Id: I9d0e0f824fdc26c64d41f97b370f7483b63b97c5
Martijn Coenen [Thu, 15 Dec 2016 20:38:07 +0000 (20:38 +0000)]
Merge "HwBinder: Remove use of IHw class."
am:
11ec22ab2a
Change-Id: Icbeb3bb7548b00c5e28f689c761a4de425e1bd74
dcashman [Thu, 15 Dec 2016 20:32:54 +0000 (20:32 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
am:
a1c9c860a9
Change-Id: I11397c898e5cf7b0dd4a300646b409d28eb00b59
Martijn Coenen [Thu, 15 Dec 2016 20:28:48 +0000 (20:28 +0000)]
Merge "HwBinder: Remove use of IHw class."
dcashman [Thu, 15 Dec 2016 20:27:27 +0000 (20:27 +0000)]
Split mac_permissions.xml into plat and non-plat components.
am:
b1cc4f8ca4
Change-Id: I4c3d3a9c088c4cfc75f5503966390030e1375305
Treehugger Robot [Thu, 15 Dec 2016 20:13:28 +0000 (20:13 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
Android Build Merger (Role) [Thu, 15 Dec 2016 19:12:49 +0000 (19:12 +0000)]
Merge "Add null check to a11y interrupt. am:
74f9e1b867 am:
278782f275" into nyc-mr2-dev-plus-aosp
Phil Weaver [Thu, 15 Dec 2016 19:12:02 +0000 (19:12 +0000)]
Add null check to a11y interrupt. am:
74f9e1b867
am:
718f403b50
Change-Id: I9d70640813bd91e035f9614f0403e18b7706e53f
Phil Weaver [Thu, 15 Dec 2016 19:11:56 +0000 (19:11 +0000)]
Add null check to a11y interrupt. am:
74f9e1b867
am:
278782f275
Change-Id: I92d0cce490535b667a10de46fe0e24fad6305c13
Phil Weaver [Thu, 15 Dec 2016 19:05:00 +0000 (19:05 +0000)]
Add null check to a11y interrupt.
am:
74f9e1b867
Change-Id: I51bcf42327f30a0c6b1dc7666a5c057d44eec98c
Phil Weaver [Thu, 15 Dec 2016 19:04:59 +0000 (19:04 +0000)]
Add null check to a11y interrupt.
am:
74f9e1b867
Change-Id: I8bb63b88a12ab6f8dfae42918ab9fdf4b1a457b5
dcashman [Wed, 14 Dec 2016 21:46:05 +0000 (13:46 -0800)]
Split mac_permissions.xml into plat and non-plat components.
Bug:
31363362
Test: Bullhead and Sailfish both build and boot without new denials.
Change-Id: Ic9523ce4b0755d6c585548f4f2b1f00e7000195b
Michal Karpinski [Thu, 15 Dec 2016 14:31:47 +0000 (14:31 +0000)]
DO NOT MERGE Make NetworkLogger.mIsLoggingEnabled an AtomicBoolean
am:
92cd0ce92d
Change-Id: I598cd5962f9e38750d528f480b7a99e3357fc437
Michal Karpinski [Thu, 15 Dec 2016 10:30:18 +0000 (10:30 +0000)]
DO NOT MERGE Make NetworkLogger.mIsLoggingEnabled an AtomicBoolean
Fixes a potential race condition - when enabling/disabling the logging
some events might have been lost.
Bug:
29748723
Change-Id: I8a436d525393b2314805e287eddcea26d4ec073b
Erik Kline [Thu, 15 Dec 2016 12:35:13 +0000 (12:35 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am:
80ff5ecd4a am:
cdcc931d93
am:
62c1d307e3
Change-Id: I05da79d601d412270a71026bbbad3c516a785422
Erik Kline [Thu, 15 Dec 2016 12:28:41 +0000 (12:28 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am:
80ff5ecd4a
am:
cdcc931d93
Change-Id: Ib46bdab897cef221f4c22326e562130822d42298
Erik Kline [Thu, 15 Dec 2016 12:22:06 +0000 (12:22 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
am:
80ff5ecd4a
Change-Id: If85702e1cc44967841ab91d723aa627862bcda21
Erik Kline [Thu, 15 Dec 2016 12:10:16 +0000 (12:10 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
Joachim Sauer [Thu, 15 Dec 2016 11:54:42 +0000 (11:54 +0000)]
Merge "API updated for ICU4J 58.1" am:
9e3b160fc3 am:
d20aebb443
am:
c066d73c32
Change-Id: Ie3f10df12dd96d9e002bdef017759c394aa3e780
Joachim Sauer [Thu, 15 Dec 2016 11:39:37 +0000 (11:39 +0000)]
Merge "API updated for ICU4J 58.1" am:
9e3b160fc3
am:
d20aebb443
Change-Id: Ib3ddf7441306adca048e2ef5c6cda31bb2543df6
Joachim Sauer [Thu, 15 Dec 2016 11:24:52 +0000 (11:24 +0000)]
Merge "API updated for ICU4J 58.1"
am:
9e3b160fc3
Change-Id: If8d8b9708217442bf23f092ef2e1bfd235926aff
Joachim Sauer [Thu, 15 Dec 2016 11:16:39 +0000 (11:16 +0000)]
Merge "API updated for ICU4J 58.1"
Erik Kline [Thu, 15 Dec 2016 10:13:48 +0000 (10:13 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev
am:
c75ab85cd2
Change-Id: Ie343e7b86b970f2d934b964eebe924f74b0138d2
Erik Kline [Thu, 15 Dec 2016 10:13:36 +0000 (10:13 +0000)]
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
am:
473355f96b
Change-Id: Ie95309464d8f368f5040c74b59daba9700191e86
Erik Kline [Wed, 19 Oct 2016 08:42:01 +0000 (17:42 +0900)]
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug:
21859053
Bug:
26101306
Bug:
31742572
Bug:
31707128
Bug:
33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
TreeHugger Robot [Thu, 15 Dec 2016 10:03:44 +0000 (10:03 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev
Erik Kline [Wed, 19 Oct 2016 08:42:01 +0000 (17:42 +0900)]
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug:
21859053
Bug:
26101306
Bug:
31742572
Bug:
31707128
Bug:
33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
Phil Weaver [Wed, 2 Nov 2016 22:40:42 +0000 (15:40 -0700)]
Add null check to a11y interrupt.
Also adding same robustness to interrupt that we have for
sending a11y events.
Bug:
32507871
Test: Ran a11y CTS. Verified manually with sample app
that sends interrupt and accessibility service that
crashes when started. That case used to crash the
app, and doesn't anymore.
Change-Id: I5cf05dcbb54ea23ae876cb3258dd206c55dce775
(cherry picked from commit
867ad35d9c676b5ba2047b0fc9a4006737e5c4aa)
Bill Yi [Thu, 15 Dec 2016 08:03:52 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE
am:
1e0cc808ab -s ours
Change-Id: I1d7db8246f0864af9e03f6dee3cf6206763b3301
Colin Cross [Thu, 15 Dec 2016 07:31:25 +0000 (07:31 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536 am:
c2f9ae35e6 am:
4379639606
am:
b9743aa650
Change-Id: Ib90a26ffe1b9af8cf83c8b1c1342aaa9f5e06752
Colin Cross [Thu, 15 Dec 2016 07:30:25 +0000 (07:30 +0000)]
Move hwui private headers to frameworks/base/libs/hwui/private am:
19def9943a am:
174d150673
am:
6b629b7f38
Change-Id: Ic62fcf3d48ad58c1dec0fc6ddf3eaacc8140cc18
Colin Cross [Thu, 15 Dec 2016 07:29:24 +0000 (07:29 +0000)]
Convert libstorage to Android.bp am:
3ac2be93a9 am:
f12ae4bed7
am:
791d02818a
Change-Id: I73bb8a7332a6ba9aebf413cf9f0889ff9d98a5de
Colin Cross [Thu, 15 Dec 2016 07:28:24 +0000 (07:28 +0000)]
Move libstorage includes into frameworks/base/lib/storage am:
e78f853e46 am:
afef87b1ba
am:
f142640afb
Change-Id: I9f084034f960478ee6141158a0a0c5119d1879a4
Colin Cross [Thu, 15 Dec 2016 07:18:02 +0000 (07:18 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536 am:
c2f9ae35e6
am:
4379639606
Change-Id: I1d29954997012b2ac435dab96486175a40cd65a8
Colin Cross [Thu, 15 Dec 2016 07:16:31 +0000 (07:16 +0000)]
Move hwui private headers to frameworks/base/libs/hwui/private am:
19def9943a
am:
174d150673
Change-Id: I0d97c3bc96c0beebc5988e4dca22ba4d5d1f982c
Colin Cross [Thu, 15 Dec 2016 07:15:32 +0000 (07:15 +0000)]
Convert libstorage to Android.bp am:
3ac2be93a9
am:
f12ae4bed7
Change-Id: I1255ee2b166b73a79b19035d59994204bb268c82
Colin Cross [Thu, 15 Dec 2016 07:14:32 +0000 (07:14 +0000)]
Move libstorage includes into frameworks/base/lib/storage am:
e78f853e46
am:
afef87b1ba
Change-Id: Iff9c41710528af37a788973ac4a1080024808c95
Colin Cross [Thu, 15 Dec 2016 07:01:01 +0000 (07:01 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536
am:
c2f9ae35e6
Change-Id: Icd7cc5949d1388a5f928561dc0eea8a7df91b1b9
Colin Cross [Thu, 15 Dec 2016 07:00:54 +0000 (07:00 +0000)]
Move hwui private headers to frameworks/base/libs/hwui/private
am:
19def9943a
Change-Id: Ic26ef842f58a9db61e7ee12b3d4d858fc24cfbc8
Colin Cross [Thu, 15 Dec 2016 07:00:07 +0000 (07:00 +0000)]
Convert libstorage to Android.bp
am:
3ac2be93a9
Change-Id: Ia1d78149bfedcc7e8959d557ac3a239a77c04924
Colin Cross [Thu, 15 Dec 2016 06:59:18 +0000 (06:59 +0000)]
Move libstorage includes into frameworks/base/lib/storage
am:
e78f853e46
Change-Id: Icac09a62152f11cf7a8d5ce5ffe9011949e17ec0
Treehugger Robot [Thu, 15 Dec 2016 06:49:35 +0000 (06:49 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536
* changes:
Move hwui private headers to frameworks/base/libs/hwui/private
Convert libstorage to Android.bp
Move libstorage includes into frameworks/base/lib/storage
Erik Kline [Thu, 15 Dec 2016 05:40:17 +0000 (05:40 +0000)]
Merge "More correct startup and shutdown procedures." am:
618d4215a2 am:
b6588f9a41
am:
7074b562d9
Change-Id: I8c1e0b235808635a910262a65530e655408cc5d8
Erik Kline [Thu, 15 Dec 2016 05:32:50 +0000 (05:32 +0000)]
Merge "More correct startup and shutdown procedures." am:
618d4215a2
am:
b6588f9a41
Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae
Erik Kline [Thu, 15 Dec 2016 05:25:48 +0000 (05:25 +0000)]
Merge "More correct startup and shutdown procedures."
am:
618d4215a2
Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42
Treehugger Robot [Thu, 15 Dec 2016 05:10:10 +0000 (05:10 +0000)]
Merge "More correct startup and shutdown procedures."
Bill Yi [Thu, 15 Dec 2016 02:56:18 +0000 (18:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5a8c801eacef878f41a988ed655e6fa367909033
Auto-generated-cl: translation import