Lorenzo Colitti
42a5b34196
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am: 4171cdf303 -s ours am: 8b8bef622a -s ours
...
am: 36f0dc6271
2016-09-07 04:38:43 +00:00
Etan Cohen
826ba669c7
[NAN] Add transport type for NAN. [DO NOT MERGE] am: bd9fdbe022 -s ours am: e3efe944fd -s ours
...
am: 481a9c73da
2016-09-07 04:38:37 +00:00
Lorenzo Colitti
36f0dc6271
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am: 4171cdf303 -s ours
...
am: 8b8bef622a
2016-09-07 04:33:24 +00:00
Etan Cohen
481a9c73da
[NAN] Add transport type for NAN. [DO NOT MERGE] am: bd9fdbe022 -s ours
...
am: e3efe944fd
2016-09-07 04:33:21 +00:00
Lorenzo Colitti
8b8bef622a
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
...
am: 4171cdf303
2016-09-07 04:28:21 +00:00
Etan Cohen
e3efe944fd
[NAN] Add transport type for NAN. [DO NOT MERGE]
...
am: bd9fdbe022
2016-09-07 04:27:28 +00:00
Roshan Pius
d74f710e25
Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 am: e597198f12
...
am: 478bb2b44d
2016-09-06 23:21:41 +00:00
Mathieu Chartier
c49450e536
Merge "Avoid profile guided compilation for vmSafeMode" am: a817838e8b am: 7554be1e36
...
am: e65bf6d173
2016-09-06 23:15:04 +00:00
Roshan Pius
478bb2b44d
Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0
...
am: e597198f12
2016-09-06 23:12:01 +00:00
Android Build Merger (Role)
a68fda1ac8
Merge "Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012 am: 130cb9232a am: b24828bd77" into nyc-mr1-dev-plus-aosp
2016-09-06 23:11:18 +00:00
Android Build Merger (Role)
aee547867d
Merge "Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e" into nyc-dev-plus-aosp am: 9c6e51be17" into nyc-mr1-dev-plus-aosp
2016-09-06 23:11:09 +00:00
Android Build Merger (Role)
451b0667da
Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e am: 202e00bec0" into nyc-mr1-dev-plus-aosp
2016-09-06 23:10:54 +00:00
Android Build Merger (Role)
288f5a3572
Merge "Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc" into nyc-dev-plus-aosp am: c4f7166e19" into nyc-mr1-dev-plus-aosp
2016-09-06 23:10:45 +00:00
Android Build Merger (Role)
06022f9a8c
Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc am: 893fbf87dc" into nyc-mr1-dev-plus-aosp
2016-09-06 23:10:36 +00:00
Android Build Merger (Role)
7fc3193792
Merge "Merge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3" into nyc-dev-plus-aosp am: 170cf7938a" into nyc-mr1-dev-plus-aosp
2016-09-06 23:10:25 +00:00
Android Build Merger (Role)
e2dadf9914
Merge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3 am: 18d954183a" into nyc-mr1-dev-plus-aosp
2016-09-06 23:10:13 +00:00
Android Build Merger (Role)
b52be559bc
Merge "Merge "OtaDexoptService: Run dexopt on all apps am: 14186731f9 am: 4775ba500c" into nyc-dev-plus-aosp am: 1b332aa41f" into nyc-mr1-dev-plus-aosp
2016-09-06 23:10:05 +00:00
yuanhuihui
29b3e92296
Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012 am: 130cb9232a
...
am: b24828bd77
2016-09-06 23:08:55 +00:00
Andreas Gampe
81d2c05da1
Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e" into nyc-dev-plus-aosp
...
am: 9c6e51be17
2016-09-06 23:08:52 +00:00
Andreas Gampe
ab55203a05
Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e
...
am: 202e00bec0
2016-09-06 23:08:49 +00:00
Todd Kennedy
4045f690c9
Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc" into nyc-dev-plus-aosp
...
am: c4f7166e19
2016-09-06 23:08:42 +00:00
Todd Kennedy
2c20d20e7b
Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc
...
am: 893fbf87dc
2016-09-06 23:08:39 +00:00
Andreas Gampe
2d05455767
Merge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3" into nyc-dev-plus-aosp
...
am: 170cf7938a
2016-09-06 23:08:32 +00:00
Andreas Gampe
d62825e212
OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3
...
am: 18d954183a
2016-09-06 23:08:29 +00:00
Andreas Gampe
466e0bc172
Merge "OtaDexoptService: Run dexopt on all apps am: 14186731f9 am: 4775ba500c" into nyc-dev-plus-aosp
...
am: 1b332aa41f
2016-09-06 23:08:21 +00:00
Tyler Gunn
f6f880c7d9
Merge "Add toString method for session event codes." into nyc-mr1-dev am: b2e0ed8772
...
am: aadc013104
2016-09-06 23:07:24 +00:00
Tyler Gunn
2a9e5263e5
Add toString method for session event codes. am: 6f657ee021
...
am: 0e783b6807
2016-09-06 23:07:12 +00:00
Roshan Pius
e597198f12
Merge "WifiConfiguration: Fix isEnterprise"
...
am: 9221c96ae0
2016-09-06 23:02:10 +00:00
Tyler Gunn
aadc013104
Merge "Add toString method for session event codes." into nyc-mr1-dev
...
am: b2e0ed8772
2016-09-06 22:54:51 +00:00
Andreas Gampe
0d8ce1dd19
OtaDexoptService: Run dexopt on all apps am: 14186731f9 am: 4775ba500c
...
am: be1adf2e72
2016-09-06 22:54:44 +00:00
Tyler Gunn
0e783b6807
Add toString method for session event codes.
...
am: 6f657ee021
2016-09-06 22:54:43 +00:00
Lorenzo Colitti
4171cdf303
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
...
(cherry-pick of commit eab17da588
2016-09-06 15:54:16 -07:00
Etan Cohen
bd9fdbe022
[NAN] Add transport type for NAN. [DO NOT MERGE]
...
Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.
While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.
(cherry-pick of commit 7b84987a6a
2016-09-06 15:54:10 -07:00
Treehugger Robot
9221c96ae0
Merge "WifiConfiguration: Fix isEnterprise"
2016-09-06 22:51:43 +00:00
Sreevani Sreejith
80b42055df
Merge "Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238" into nyc-dev am: d2273e433c" into nyc-dev-plus-aosp
...
am: 885368f48e
2016-09-06 22:48:17 +00:00
Sreevani Sreejith
29ab7d7e60
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238" into nyc-dev am: d2273e433c
...
am: 93c66158ce
2016-09-06 22:48:12 +00:00
sreevanis
d4fcdbfc7c
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238 am: 1e4bc15f31" into nyc-dev-plus-aosp
...
am: b6933ca1e4
2016-09-06 22:48:01 +00:00
sreevanis
3e8511ebe3
docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238 am: 1e4bc15f31
...
am: 979710ce56
2016-09-06 22:47:57 +00:00
Tyler Gunn
b2e0ed8772
Merge "Add toString method for session event codes." into nyc-mr1-dev
2016-09-06 22:47:34 +00:00
Andreas Gampe
bf711077c0
Frameworks/base: Add compiler stats to Package Manager am: 7e619a912c am: 723bbd880a
...
am: 4cff287df2
2016-09-06 22:44:34 +00:00
Jaewan Kim
b8ff6a61a6
Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev am: e70f79b584
...
am: f3da814415
2016-09-06 22:41:52 +00:00
Jaewan Kim
512bf0aa25
Keep the PIP at the shifted position when the Settings is shown am: 177801c273
...
am: df20aed9f7
2016-09-06 22:41:46 +00:00
Calin Juravle
f0036acbfd
[RFC] Special case system apps for profile optimizations am: 08313b0d95 am: 788e111cba
...
am: 0bc450ac05
2016-09-06 22:38:59 +00:00
Mathieu Chartier
e65bf6d173
Merge "Avoid profile guided compilation for vmSafeMode" am: a817838e8b
...
am: 7554be1e36
2016-09-06 22:38:18 +00:00
Jaewan Kim
f3da814415
Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev
...
am: e70f79b584
2016-09-06 22:35:28 +00:00
Jaewan Kim
df20aed9f7
Keep the PIP at the shifted position when the Settings is shown
...
am: 177801c273
2016-09-06 22:35:20 +00:00
Mathieu Chartier
7554be1e36
Merge "Avoid profile guided compilation for vmSafeMode"
...
am: a817838e8b
2016-09-06 22:30:34 +00:00
Calin Juravle
88b02592f4
Compile core-apps according to their own "reason" for A/B am: 9438528d99 am: 54a3247073
...
am: 30d58efb59
2016-09-06 22:30:34 +00:00
Jaewan Kim
e70f79b584
Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev
2016-09-06 22:27:27 +00:00
Mathieu Chartier
a817838e8b
Merge "Avoid profile guided compilation for vmSafeMode"
2016-09-06 22:19:03 +00:00
