OSDN Git Service
John Stultz [Wed, 3 Aug 2016 00:17:56 +0000 (00:17 +0000)]
Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am:
1085be0ce3
am:
5e23ab394a
Change-Id: If1d303010a604bf6c1c745ea9e2d920eea20f5aa
John Stultz [Wed, 3 Aug 2016 00:12:32 +0000 (00:12 +0000)]
Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
am:
1085be0ce3
Change-Id: I23d7c2af33db8621b0c3b3415669543e0e3b740f
Treehugger Robot [Wed, 3 Aug 2016 00:04:19 +0000 (00:04 +0000)]
Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
Andrew Solovay [Tue, 2 Aug 2016 21:47:40 +0000 (21:47 +0000)]
cherry-pick from nyc-dev: docs: SafeBrowsing API am:
741757f27f
am:
328a6a12eb
Change-Id: I442d5474cef4b92917f7604e3127dfad0fd6d74f
Joe Fernandez [Tue, 2 Aug 2016 21:40:19 +0000 (21:40 +0000)]
Resolve merge conflicts of
ffb4eb1 to nyc-dev
am:
a5abfee3a5
Change-Id: I01aae4c96bba37ef8e2466821fdce39881d3e022
Joe Fernandez [Tue, 2 Aug 2016 21:36:02 +0000 (21:36 +0000)]
cherry-pick from nyc-dev: docs: SafeBrowsing API
am:
741757f27f
Change-Id: Ice1968509af665160646025e708d3802b39ef4c4
Andrew Solovay [Tue, 2 Aug 2016 21:14:08 +0000 (14:14 -0700)]
docs: Fixing download redirects
URLS of the form https://developer.android.com/downloads/… weren't
properly redirecting to
https://commondatastorage.googleapis.com/androiddevelopers/…
bug:
30594087
Change-Id: I18e026c236d081b6bb510900e5928107105b93cd
Kevin Hufnagle [Tue, 2 Aug 2016 18:11:22 +0000 (11:11 -0700)]
Resolve merge conflicts of
ffb4eb1 to nyc-dev
Change-Id: I2f096fc31de12fb4e4715343854a5f09049e4221
Joe Fernandez [Tue, 12 Apr 2016 18:35:23 +0000 (11:35 -0700)]
cherry-pick from nyc-dev: docs: SafeBrowsing API
b/
27438791
Change-Id: Ib7f93a7e95068c1909a3b104b83681e2d2f35ee6
Original-Change-Id: I14a34bbec51dc33dd4d730d59268690c9bee3992
Joe Fernandez [Tue, 2 Aug 2016 00:38:51 +0000 (00:38 +0000)]
Merge "docs: Add ARC documentation TOC file" into nyc-dev
am:
2b318b3a4e
Change-Id: I31072557343554054f7ce2163c2d0485bd36611c
Joe Fernandez [Tue, 2 Aug 2016 00:38:29 +0000 (00:38 +0000)]
docs: Add ARC documentation TOC file
am:
129012530f
Change-Id: Ibd9b721fc87de52f81400936b6fbb8ad1f167fee
Joe Fernandez [Tue, 2 Aug 2016 00:25:17 +0000 (00:25 +0000)]
Merge "docs: Add ARC documentation TOC file" into nyc-dev
Kevin Hufnagle [Tue, 2 Aug 2016 00:10:25 +0000 (00:10 +0000)]
docs: Updated layout and timestamps of developer stories. am:
997ccdc071
am:
4bb55d7103
Change-Id: Ia09d64994190df697fe25112e010d986937b267f
Kevin Hufnagle [Tue, 2 Aug 2016 00:03:21 +0000 (00:03 +0000)]
docs: Updated layout and timestamps of developer stories.
am:
997ccdc071
Change-Id: I252e78ef43a7aaae469e014f4079a29d15978e9f
Joe Fernandez [Mon, 1 Aug 2016 15:19:03 +0000 (08:19 -0700)]
docs: Add ARC documentation TOC file
b/
30114799
Change-Id: I397f4712c82628f1b7aa4565fb5ab40381f9f5e2
Kevin Hufnagle [Mon, 1 Aug 2016 23:51:22 +0000 (23:51 +0000)]
Merge "docs: Updated layout and timestamps of developer stories." into nyc-dev
am:
7ba0b437cf
Change-Id: If6f86b8ffd2c614424822e33ec5f099b28881126
Kevin Hufnagle [Mon, 1 Aug 2016 23:51:16 +0000 (23:51 +0000)]
docs: Updated layout and timestamps of developer stories.
am:
f44fbe2b4e
Change-Id: I690a972dfac0d5b5d75489bbc9ce5d1c6341d45b
Kevin Hufnagle [Mon, 1 Aug 2016 23:44:15 +0000 (23:44 +0000)]
Merge "docs: Updated layout and timestamps of developer stories." into nyc-dev
Dan Willemsen [Mon, 1 Aug 2016 23:39:40 +0000 (23:39 +0000)]
Merge "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite" into stage-aosp-master
am:
da9d54c685
Change-Id: I3cdc3018c435112a768d1fa7d822154607eee90b
Dan Willemsen [Mon, 1 Aug 2016 23:39:34 +0000 (23:39 +0000)]
Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite
am:
2005edf642
Change-Id: I48dfa98a54a8680d091cbc403feb30bba35f2efd
Dan Willemsen [Mon, 1 Aug 2016 23:34:29 +0000 (23:34 +0000)]
Merge "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite" into stage-aosp-master
Android Build Merger (Role) [Mon, 1 Aug 2016 22:59:21 +0000 (22:59 +0000)]
Merge "Merge "libsigchain: intercept bsd_signal on lp32" am:
6eb30f2060 am:
4e3a78a5ff" into nyc-dev-plus-aosp
Dimitry Ivanov [Mon, 1 Aug 2016 22:58:33 +0000 (22:58 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32" am:
6eb30f2060
am:
4e3a78a5ff
Change-Id: I4bbcc38612d49b9dbf81633a75b7f8054e0d7ffb
Joe Fernandez [Mon, 1 Aug 2016 22:57:43 +0000 (22:57 +0000)]
Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev
am:
30583c32e2
Change-Id: I67620241a6ad496436af3055bcbb88ec1c946894
Joe Fernandez [Mon, 1 Aug 2016 22:57:39 +0000 (22:57 +0000)]
cherry-pick from mnc-mr-docs: docs: SafeBrowsing API
am:
843f022c47
Change-Id: I2da29f13d230efef97218198e0efb3719d5d67c3
Kevin Hufnagle [Mon, 1 Aug 2016 22:49:56 +0000 (22:49 +0000)]
Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev
Dimitry Ivanov [Mon, 1 Aug 2016 22:46:55 +0000 (22:46 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
am:
6eb30f2060
Change-Id: Iee2b7a8db495dd76bb6468a03e6cffd29a998cdf
Treehugger Robot [Mon, 1 Aug 2016 22:39:15 +0000 (22:39 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
Dimitry Ivanov [Mon, 1 Aug 2016 21:12:38 +0000 (14:12 -0700)]
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
Daniel Yu [Mon, 1 Aug 2016 19:51:49 +0000 (19:51 +0000)]
Merge \"docs: Fixing incorrect div tags in l10n N docs\" into nyc-dev
am:
d70113bbd0
Change-Id: I88c4d8c78e53e0b3e3bbc82e873b200ac71604d7
Daniel Yu [Mon, 1 Aug 2016 19:51:46 +0000 (19:51 +0000)]
docs: Fixing incorrect div tags in l10n N docs
am:
3629bc8854
Change-Id: Idd644fdd814351366bc29ae96d7b1079e87ea078
Dan Yu [Mon, 1 Aug 2016 19:44:32 +0000 (19:44 +0000)]
Merge "docs: Fixing incorrect div tags in l10n N docs" into nyc-dev
Joe Fernandez [Tue, 12 Apr 2016 18:35:23 +0000 (11:35 -0700)]
cherry-pick from mnc-mr-docs: docs: SafeBrowsing API
b/
27438791
Change-Id: I14a34bbec51dc33dd4d730d59268690c9bee3992
Original-Change-Id: I00f4a374353dfb62cee44713ac5faadc0a9268d5
Kevin Hufnagle [Tue, 19 Jul 2016 04:18:26 +0000 (21:18 -0700)]
docs: Updated layout and timestamps of developer stories.
The developer stories for Aftenposten, El Mundo, Segundamano, Tapps,
and Upbeat Games now appear closer to the beginning/top of a section
on the newly-formatted "latest" page.
Also, Tapps and Upbeat Games now appear within the "games" section,
not the "apps" section. The Glu case study also appears within the
"games" section; it was incorrectly appearing under the root
"stories" directory before.
Finally, removed a duplicate case study describing Dots increasing
installs using Store Listing Experiments.
Bug:
29240693
Change-Id: Ieec3afd2f56320da00ee4b97d8cd8de8253784dd
Fyodor Kupolov [Mon, 1 Aug 2016 17:50:09 +0000 (17:50 +0000)]
Merge \\"Fix the API compatibility of \\"UriMatcher#addURI\\"\\" am:
3e151273a3
am:
bc8d946e09
Change-Id: I6ab069a0e02e6b1053dafe98671ab68ef99ff527
Hidehiko Tsuchiya [Mon, 1 Aug 2016 17:43:30 +0000 (17:43 +0000)]
Merge \"Fix the API compatibility of \"UriMatcher#addURI\"\"
am:
3e151273a3
Change-Id: Ic06ade3ce6dd795e7d12cfba150286933512433d
Fyodor Kupolov [Mon, 1 Aug 2016 17:34:32 +0000 (17:34 +0000)]
Merge "Fix the API compatibility of "UriMatcher#addURI""
Daniel Yu [Mon, 1 Aug 2016 17:25:12 +0000 (10:25 -0700)]
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
Joe Fernandez [Mon, 1 Aug 2016 16:50:18 +0000 (16:50 +0000)]
docs: Update Android Dashboard for August 2016 am:
3d1cd9d2da
am:
5483ad29ad
Change-Id: I2513f4a2ead2b26c0c71da09669c0b510b69ba8a
Joe Fernandez [Mon, 1 Aug 2016 16:43:59 +0000 (16:43 +0000)]
docs: Update Android Dashboard for August 2016
am:
3d1cd9d2da
Change-Id: Ie50f433a6399ae5690c722a703614443889c30da
Joe Fernandez [Mon, 1 Aug 2016 16:10:29 +0000 (09:10 -0700)]
docs: Update Android Dashboard for August 2016
Change-Id: I6e5d35a3f3ed4f79f7acd485fc66f250d90f828a
Dan Willemsen [Mon, 1 Aug 2016 05:48:28 +0000 (22:48 -0700)]
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
Sungsoo Lim [Sat, 30 Jul 2016 08:22:24 +0000 (08:22 +0000)]
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
Change-Id: I1034da2c59cc363d371e5c0a0a87cf611f5949c6
Sungsoo Lim [Sat, 30 Jul 2016 08:17:49 +0000 (08:17 +0000)]
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
Change-Id: I98ceec760f862404e48477472f4931f8d49490f1
Sungsoo Lim [Sat, 30 Jul 2016 08:11:04 +0000 (08:11 +0000)]
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
Change-Id: Ia66f61ac4d53b2908b6a468375346c21c61c2d5a
Sungsoo Lim [Sat, 30 Jul 2016 07:47:58 +0000 (07:47 +0000)]
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
Change-Id: Ife41dcf7e698b1d0a02231710bc36fe197765d88
Sungsoo Lim [Sat, 30 Jul 2016 07:42:35 +0000 (07:42 +0000)]
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
Change-Id: Ic5f0abe33b51bd085a990c1d48d5c7c9eb5af8fe
Sungsoo Lim [Sat, 30 Jul 2016 07:31:34 +0000 (07:31 +0000)]
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
Change-Id: I00e4f8f8f0e6a98bee0212dede9362297715127a
Sungsoo Lim [Sat, 30 Jul 2016 07:23:37 +0000 (07:23 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c am:
1fcc472b3e -s ours am:
1559998d08 am:
c3485668ad
am:
174f17bc19
Change-Id: Id47b0c1771b9fb85b874b9d7b8892d31506a842b
Sungsoo Lim [Sat, 30 Jul 2016 07:14:33 +0000 (07:14 +0000)]
Merge \\\\\"DO NOT MERGE: Fix CTS regression\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours
am:
cc154342aa
Change-Id: Ic1bc071d11c42771d46ad1b2da9e9264299d5e7b
Sudheer Shanka [Sat, 30 Jul 2016 07:13:57 +0000 (07:13 +0000)]
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
Change-Id: Id82215d3e65497f7688895689bb88776aa8bc1ce
Sungsoo Lim [Sat, 30 Jul 2016 07:13:57 +0000 (07:13 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c am:
1fcc472b3e -s ours am:
1559998d08
am:
c3485668ad
Change-Id: Ieaf58a651f3bd15ee49d81fea3f118331e908cd7
Sudheer Shanka [Sat, 30 Jul 2016 07:13:51 +0000 (07:13 +0000)]
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
Change-Id: Ie1b16fc63548178a52ce1aab4f8491408dfedd63
Sudheer Shanka [Sat, 30 Jul 2016 06:57:38 +0000 (06:57 +0000)]
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
Change-Id: I698f563a4006e4accf2febae0aba6061c46688a2
Sudheer Shanka [Sat, 30 Jul 2016 06:57:35 +0000 (06:57 +0000)]
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
Change-Id: I4723ec70d9f4193cff5521e4a06013d57bac9666
Sudheer Shanka [Sat, 30 Jul 2016 06:57:34 +0000 (06:57 +0000)]
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
Change-Id: I42aae3b041aa7f4bb979acb2900c14630f98b5e7
Sudheer Shanka [Sat, 30 Jul 2016 06:57:29 +0000 (06:57 +0000)]
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
Change-Id: I7e3838dbcc651182eaa23299887142004782d557
Sungsoo Lim [Sat, 30 Jul 2016 06:55:41 +0000 (06:55 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c am:
1fcc472b3e -s ours
am:
1559998d08
Change-Id: Iececea055821da36f2aa7870e1c2fc04ac58e22c
Sudheer Shanka [Sat, 30 Jul 2016 06:49:33 +0000 (06:49 +0000)]
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
Change-Id: I6808755cfd17d41a7cbcbfb54b619eba535b6570
Sudheer Shanka [Sat, 30 Jul 2016 06:49:29 +0000 (06:49 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
8a8d7e7962 am:
2349d0dea5 am:
7559673a6d
am:
77f0b54c0b -s ours
Change-Id: I9b35d77bd9cda1f9884f86c9d0db3a46981fc8cc
Sudheer Shanka [Sat, 30 Jul 2016 06:43:27 +0000 (06:43 +0000)]
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
Change-Id: Ib123df6f044bb7a5323235a4aafe69b04865acfa
Sudheer Shanka [Sat, 30 Jul 2016 06:43:25 +0000 (06:43 +0000)]
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
Change-Id: I89358f925d063a311f208c92ae7b34f9dcffad8b
Sungsoo Lim [Sat, 30 Jul 2016 06:41:37 +0000 (06:41 +0000)]
Merge \\\\"DO NOT MERGE: Fix CTS regression\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648
am:
ec986ac944 -s ours
Change-Id: I66ddeab0f0f2fa3d3f3fff71a20cd0b842c2f9d6
Sungsoo Lim [Sat, 30 Jul 2016 06:41:33 +0000 (06:41 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c
am:
1fcc472b3e -s ours
Change-Id: Icf6055101947c23621ed320469c475dd105dd60f
Sudheer Shanka [Sat, 30 Jul 2016 06:31:19 +0000 (06:31 +0000)]
Merge \\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\" into mnc-dev am:
e140322bde am:
088e081ac1
am:
72f9d1ff97
Change-Id: I71b12632934b7ac1284929e276a6a462509ab969
Sudheer Shanka [Sat, 30 Jul 2016 06:31:16 +0000 (06:31 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
8a8d7e7962 am:
2349d0dea5
am:
7559673a6d
Change-Id: I874a78978c631ed3060fcac1547b261537045d8c
Sudheer Shanka [Sat, 30 Jul 2016 06:30:14 +0000 (06:30 +0000)]
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
Change-Id: I8a40d4f562110009f0e155c370e09daea6cafe79
Sudheer Shanka [Sat, 30 Jul 2016 06:30:10 +0000 (06:30 +0000)]
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
Change-Id: Ibcbf12ee9bb11c76c46a3d0db5aad81e8462a9f6
Sudheer Shanka [Sat, 30 Jul 2016 06:21:06 +0000 (06:21 +0000)]
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
Change-Id: I5fb6decba8be97f68a0b24d6caa5d718929ea4d3
Sudheer Shanka [Sat, 30 Jul 2016 06:21:04 +0000 (06:21 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e am:
9f6bd40108 am:
f01ee1c291 -s ours
am:
373492b076
Change-Id: Ibfc86e4b13fcc88c09b7ac74a7b0ddc4bd42dda7
Sudheer Shanka [Sat, 30 Jul 2016 06:19:25 +0000 (06:19 +0000)]
Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into mnc-dev am:
e140322bde
am:
088e081ac1
Change-Id: Ia0621eda31e392aa381f401bf05782201a4037a0
Sudheer Shanka [Sat, 30 Jul 2016 06:19:20 +0000 (06:19 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
8a8d7e7962
am:
2349d0dea5
Change-Id: Id099c53df0a4a7c6996e546dfe6017b375f6d34e
Sungsoo Lim [Sat, 30 Jul 2016 05:57:16 +0000 (05:57 +0000)]
Merge \\\"DO NOT MERGE: Fix CTS regression\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9
am:
8ef8e2b648
Change-Id: I245e257deb8febb49f2abd7322eb3a24db564b31
Sungsoo Lim [Sat, 30 Jul 2016 05:57:09 +0000 (05:57 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95
am:
f928b8062c
Change-Id: I92c4e992dc23f43851a9fab8479db408a89f5e89
Sungsoo Lim [Sat, 30 Jul 2016 05:40:55 +0000 (05:40 +0000)]
Merge \\"DO NOT MERGE: Fix CTS regression\\" into lmp-dev am:
124cc534f8 -s ours
am:
3d58e326d9
Change-Id: Ic642286098aeeafe379c7f71b6a98da61fb31a21
Sungsoo Lim [Sat, 30 Jul 2016 05:40:52 +0000 (05:40 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours
am:
0fb1075d95
Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636
Kevin Hufnagle [Sat, 30 Jul 2016 05:30:07 +0000 (05:30 +0000)]
Merge \\"docs: Improved Google Play Developer Console documentation\\" into nyc-docs am:
88f0518ce3
am:
72108d200d
Change-Id: I71891e226c2e574986a9b9963a9f0c2518a5e524
Kevin Hufnagle [Sat, 30 Jul 2016 05:30:03 +0000 (05:30 +0000)]
docs: Improved Google Play Developer Console documentation am:
ec8b21a27a
am:
e37a55b840
Change-Id: I972e523486a87eef37af3c76b10adbedde6e88d2
Sudheer Shanka [Sat, 30 Jul 2016 05:30:00 +0000 (05:30 +0000)]
Merge \"Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into nyc-dev
am:
b7c3ae1a86
Change-Id: I9136e54b1438fddc9f7953b49341bd2f9775e452
Sudheer Shanka [Sat, 30 Jul 2016 05:29:57 +0000 (05:29 +0000)]
Allow apps with CREATE_USERS permission to call UM.getProfiles.
am:
7468091329
Change-Id: I8025b2876167e8f39046bbe65463a2225ac1ecd1
Sudheer Shanka [Sat, 30 Jul 2016 05:26:52 +0000 (05:26 +0000)]
Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into mnc-dev
am:
e140322bde
Change-Id: Idc3caa0c20f5d069ad6166f69d858ce8f6c99302
Sudheer Shanka [Sat, 30 Jul 2016 05:26:51 +0000 (05:26 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
am:
8a8d7e7962
Change-Id: Id3a971b538618801f97abe0bd1d03d11d2b8118c
Sudheer Shanka [Sat, 30 Jul 2016 05:19:02 +0000 (05:19 +0000)]
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
Change-Id: Ifc5732a29b101a9b85a4fd14ff6d0a59d778217c
Sudheer Shanka [Sat, 30 Jul 2016 05:18:59 +0000 (05:18 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e am:
9f6bd40108
am:
f01ee1c291 -s ours
Change-Id: I9bf603d8e6315552d8d00036aa67dc96e9ba678a
Sudheer Shanka [Sat, 30 Jul 2016 05:08:39 +0000 (05:08 +0000)]
Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into lmp-mr1-dev am:
dbbdb6d089
am:
9ed6bd83ff
Change-Id: I4f3bac4ecfc819dcca55a5bc725060b63c1b80ea
Sudheer Shanka [Sat, 30 Jul 2016 05:08:35 +0000 (05:08 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e
am:
9f6bd40108
Change-Id: Id8afe281abcf8e9b07d7a92daacf922952273573
Sudheer Shanka [Sat, 30 Jul 2016 04:54:27 +0000 (04:54 +0000)]
Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into lmp-mr1-dev
am:
dbbdb6d089
Change-Id: I53e854c96f9bf68855ea949a640c4701e0b2ba5e
Sudheer Shanka [Sat, 30 Jul 2016 04:54:25 +0000 (04:54 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
am:
7ef684713e
Change-Id: I0a9fa6126709e9cf3d3be7653f48503613d10f27
Kevin Hufnagle [Sat, 30 Jul 2016 04:45:14 +0000 (04:45 +0000)]
Merge \"docs: Improved Google Play Developer Console documentation\" into nyc-docs
am:
88f0518ce3
Change-Id: I7fa7fc49019e1489837cb051729d41ee321b92dc
Kevin Hufnagle [Sat, 30 Jul 2016 04:45:09 +0000 (04:45 +0000)]
docs: Improved Google Play Developer Console documentation
am:
ec8b21a27a
Change-Id: Ie49e420caa8986855678ac6c702fbca9aa837cdb
Sungsoo Lim [Sat, 30 Jul 2016 04:44:18 +0000 (04:44 +0000)]
Merge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev
am:
124cc534f8 -s ours
Change-Id: I960e31d55b6c47df345457afbd505c50afeebcfa
Sungsoo Lim [Sat, 30 Jul 2016 04:44:16 +0000 (04:44 +0000)]
DO NOT MERGE: Fix CTS regression
am:
edc9238514 -s ours
Change-Id: If11ad6b402e48aebcce8afc6d5f6093bde539a6e
Hidehiko Tsuchiya [Tue, 25 Mar 2014 09:27:27 +0000 (18:27 +0900)]
Fix the API compatibility of "UriMatcher#addURI"
The previous patch (
ef23bf19 Allow leading slash in path...) made
a single slash path unmatchable.
To solve it, this patch stops removing a slash character if the path
only has a slash character.
Now, a single slash is a matchable path for a URI without path string.
Bug:
29524484
Change-Id: I90b357aa48be1a3e0cf36e75ed2a9d6532908972
Sungsoo Lim [Fri, 29 Jul 2016 23:18:51 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev
Kevin Hufnagle [Fri, 29 Jul 2016 22:01:18 +0000 (22:01 +0000)]
Merge "docs: Improved Google Play Developer Console documentation" into nyc-docs
Sudheer Shanka [Fri, 29 Jul 2016 21:50:39 +0000 (21:50 +0000)]
Merge "Allow apps with CREATE_USERS permission to call UM.getProfiles." into nyc-dev
Sudheer Shanka [Fri, 29 Jul 2016 21:50:37 +0000 (21:50 +0000)]
Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into mnc-dev
Sudheer Shanka [Fri, 29 Jul 2016 21:50:32 +0000 (21:50 +0000)]
Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into lmp-mr1-dev
Mark Lu [Fri, 29 Jul 2016 21:03:02 +0000 (21:03 +0000)]
Merge \\"docs: fix escaped characters in data binding doc\\" into nyc-docs am:
4172905146
am:
06c1159b0a
Change-Id: I1fff6816d546f43f0da72cef2fccba445c817b3e
Mark Lu [Fri, 29 Jul 2016 21:02:58 +0000 (21:02 +0000)]
docs: fix escaped characters in data binding doc am:
011c07bd80
am:
494d775cde
Change-Id: If30c7493e1a24fd3a1417eea9f9bc647cc31abce
OSDN Git Service
