Dan Willemsen
4ee22dd083
Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite
...
am: 2005edf642
2016-08-01 23:39:34 +00:00
Android Build Merger (Role)
1e35cb6025
Merge "Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 am: 4e3a78a5ff" into nyc-dev-plus-aosp
2016-08-01 22:59:22 +00:00
Dimitry Ivanov
c58ea7d777
Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060
...
am: 4e3a78a5ff
2016-08-01 22:58:33 +00:00
Joe Fernandez
85b3c19fd3
Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev
...
am: 30583c32e2
2016-08-01 22:57:43 +00:00
Joe Fernandez
e07150aff2
cherry-pick from mnc-mr-docs: docs: SafeBrowsing API
...
am: 843f022c47
2016-08-01 22:57:39 +00:00
Kevin Hufnagle
30583c32e2
Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev
2016-08-01 22:49:58 +00:00
Dimitry Ivanov
4e3a78a5ff
Merge "libsigchain: intercept bsd_signal on lp32"
...
am: 6eb30f2060
2016-08-01 22:46:55 +00:00
Treehugger Robot
6eb30f2060
Merge "libsigchain: intercept bsd_signal on lp32"
2016-08-01 22:39:16 +00:00
Dimitry Ivanov
4c5281862f
libsigchain: intercept bsd_signal on lp32
...
bsd_signal is a deprecated synonym for the signal. Nevertheless
there are apps and libraries calling this function.
libsigchain needs to intercept these calls and handle them the same
way it handles signal() call.
Bug: http://b/30562229
Test: readelf --dyn-sym app_process32 and check that bsd_signal is exported
readelf --dyn-sym app_process64 and check that bsd_signal is not exported
Change-Id: Iec584070b42bc7fa43b114c0f884aff2db5a6858
2016-08-01 14:19:26 -07:00
Daniel Yu
d22cf801f8
Merge \"docs: Fixing incorrect div tags in l10n N docs\" into nyc-dev
...
am: d70113bbd0
2016-08-01 19:51:49 +00:00
Daniel Yu
5af0def898
docs: Fixing incorrect div tags in l10n N docs
...
am: 3629bc8854
2016-08-01 19:51:46 +00:00
Dan Yu
d70113bbd0
Merge "docs: Fixing incorrect div tags in l10n N docs" into nyc-dev
2016-08-01 19:44:33 +00:00
Joe Fernandez
843f022c47
cherry-pick from mnc-mr-docs: docs: SafeBrowsing API
...
b/27438791
Change-Id: I14a34bbec51dc33dd4d730d59268690c9bee3992
Original-Change-Id: I00f4a374353dfb62cee44713ac5faadc0a9268d5
2016-08-01 12:39:24 -07:00
Fyodor Kupolov
dbf07bb8ef
Merge \\"Fix the API compatibility of \\"UriMatcher#addURI\\"\\" am: 3e151273a3
...
am: bc8d946e09
2016-08-01 17:50:09 +00:00
Hidehiko Tsuchiya
bc8d946e09
Merge \"Fix the API compatibility of \"UriMatcher#addURI\"\"
...
am: 3e151273a3
2016-08-01 17:43:30 +00:00
Fyodor Kupolov
3e151273a3
Merge "Fix the API compatibility of "UriMatcher#addURI""
2016-08-01 17:34:32 +00:00
Daniel Yu
3629bc8854
docs: Fixing incorrect div tags in l10n N docs
...
When some N preview docs were migrated into regular
developer.android.com docs, the div tags were not switched
from qv-wrapper/qv to tb-wrapper/tb.
Bug: 30479904
Change-Id: I03708fd372e9498d5c9810e8ad990bece5521092
2016-08-01 10:25:12 -07:00
Joe Fernandez
42fc0a5548
docs: Update Android Dashboard for August 2016 am: 3d1cd9d2da
...
am: 5483ad29ad
2016-08-01 16:50:18 +00:00
Joe Fernandez
5483ad29ad
docs: Update Android Dashboard for August 2016
...
am: 3d1cd9d2da
2016-08-01 16:43:59 +00:00
Joe Fernandez
3d1cd9d2da
docs: Update Android Dashboard for August 2016
...
Change-Id: I6e5d35a3f3ed4f79f7acd485fc66f250d90f828a
2016-08-01 16:34:59 +00:00
Dan Willemsen
2005edf642
Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite
...
Use the same name for the static and shared libraries so that the module
definitions can be shared.
Change-Id: I1578ee7044689194ae1baea4d71f1b0e8737505f
2016-07-31 22:48:28 -07:00
Sungsoo Lim
c4cabe1896
Merge \\\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944 -s ours am: cc154342aa am: ee0c3b013a am: 0d05028ba8 am: 2f7756f4c9 -s ours
...
am: ea7fa85a0d
2016-07-30 08:22:24 +00:00
Sungsoo Lim
ea7fa85a0d
Merge \\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944 -s ours am: cc154342aa am: ee0c3b013a am: 0d05028ba8
...
am: 2f7756f4c9
2016-07-30 08:17:49 +00:00
Sungsoo Lim
2f7756f4c9
Merge \\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944 -s ours am: cc154342aa am: ee0c3b013a
...
am: 0d05028ba8
2016-07-30 08:11:04 +00:00
Sungsoo Lim
43e26c9f17
DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e -s ours am: 1559998d08 am: c3485668ad am: 174f17bc19 am: cf94d53469 -s ours
...
am: accabefc6b
2016-07-30 07:47:58 +00:00
Sungsoo Lim
0d05028ba8
Merge \\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944 -s ours am: cc154342aa
...
am: ee0c3b013a
2016-07-30 07:42:35 +00:00
Sungsoo Lim
accabefc6b
DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e -s ours am: 1559998d08 am: c3485668ad am: 174f17bc19
...
am: cf94d53469
2016-07-30 07:31:34 +00:00
Sungsoo Lim
cf94d53469
DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e -s ours am: 1559998d08 am: c3485668ad
...
am: 174f17bc19
2016-07-30 07:23:37 +00:00
Sungsoo Lim
ee0c3b013a
Merge \\\\\"DO NOT MERGE: Fix CTS regression\\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944 -s ours
...
am: cc154342aa
2016-07-30 07:14:33 +00:00
Sudheer Shanka
68887cf986
Merge \\\\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours am: 98ae56902e am: 382f9aadcd am: 9457779aa4 am: 247edeb721 -s ours
...
am: 3cfa1bb8ec
2016-07-30 07:13:57 +00:00
Sungsoo Lim
174f17bc19
DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e -s ours am: 1559998d08
...
am: c3485668ad
2016-07-30 07:13:57 +00:00
Sudheer Shanka
c62c942adb
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours am: 373492b076 am: c2178ed1d9 am: 32f4f1a697 am: 5b420a7b44 -s ours
...
am: efe9502301
2016-07-30 07:13:51 +00:00
Sudheer Shanka
d9e9cf0ab1
Merge \\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\" into mnc-dev am: e140322bde am: 088e081ac1 am: 72f9d1ff97 am: 9a7c067034 -s ours
...
am: ea60ad5173
2016-07-30 06:57:38 +00:00
Sudheer Shanka
3cfa1bb8ec
Merge \\\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours am: 98ae56902e am: 382f9aadcd am: 9457779aa4
...
am: 247edeb721
2016-07-30 06:57:35 +00:00
Sudheer Shanka
6c43ea3376
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 8a8d7e7962 am: 2349d0dea5 am: 7559673a6d am: 77f0b54c0b -s ours
...
am: a8ff98fbce
2016-07-30 06:57:34 +00:00
Sudheer Shanka
efe9502301
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours am: 373492b076 am: c2178ed1d9 am: 32f4f1a697
...
am: 5b420a7b44
2016-07-30 06:57:29 +00:00
Sungsoo Lim
c3485668ad
DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e -s ours
...
am: 1559998d08
2016-07-30 06:55:41 +00:00
Sudheer Shanka
ea60ad5173
Merge \\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\" into mnc-dev am: e140322bde am: 088e081ac1 am: 72f9d1ff97
...
am: 9a7c067034
2016-07-30 06:49:33 +00:00
Sudheer Shanka
a8ff98fbce
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 8a8d7e7962 am: 2349d0dea5 am: 7559673a6d
...
am: 77f0b54c0b
2016-07-30 06:49:29 +00:00
Sudheer Shanka
247edeb721
Merge \\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours am: 98ae56902e am: 382f9aadcd
...
am: 9457779aa4
2016-07-30 06:43:27 +00:00
Sudheer Shanka
5b420a7b44
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours am: 373492b076 am: c2178ed1d9
...
am: 32f4f1a697
2016-07-30 06:43:25 +00:00
Sungsoo Lim
cc154342aa
Merge \\\\"DO NOT MERGE: Fix CTS regression\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648
...
am: ec986ac944
2016-07-30 06:41:37 +00:00
Sungsoo Lim
1559998d08
DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c
...
am: 1fcc472b3e
2016-07-30 06:41:33 +00:00
Sudheer Shanka
9a7c067034
Merge \\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\" into mnc-dev am: e140322bde am: 088e081ac1
...
am: 72f9d1ff97
2016-07-30 06:31:19 +00:00
Sudheer Shanka
77f0b54c0b
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 8a8d7e7962 am: 2349d0dea5
...
am: 7559673a6d
2016-07-30 06:31:16 +00:00
Sudheer Shanka
9457779aa4
Merge \\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours am: 98ae56902e
...
am: 382f9aadcd
2016-07-30 06:30:14 +00:00
Sudheer Shanka
32f4f1a697
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours am: 373492b076
...
am: c2178ed1d9
2016-07-30 06:30:10 +00:00
Sudheer Shanka
382f9aadcd
Merge \\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours
...
am: 98ae56902e
2016-07-30 06:21:06 +00:00
Sudheer Shanka
c2178ed1d9
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours
...
am: 373492b076
2016-07-30 06:21:04 +00:00
Sudheer Shanka
72f9d1ff97
Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into mnc-dev am: e140322bde
...
am: 088e081ac1
2016-07-30 06:19:25 +00:00
