OSDN Git Service

android-x86/frameworks-base.git
8 years agodocs: Updated layout and timestamps of developer stories.
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

8 years agoMerge "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite" into stage-aosp...
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

8 years agoRename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite
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

8 years agoMerge "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite" into stage-aosp...
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

8 years agoMerge "Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 am: 4e3a78a5f...
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

8 years agoMerge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060
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

8 years agoMerge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev
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

8 years agocherry-pick from mnc-mr-docs: docs: SafeBrowsing API
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

8 years agoMerge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev
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

8 years agoMerge "libsigchain: intercept bsd_signal on lp32"
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

8 years agoMerge "libsigchain: intercept bsd_signal on lp32"
Treehugger Robot [Mon, 1 Aug 2016 22:39:15 +0000 (22:39 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"

8 years agolibsigchain: 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

8 years agoMerge \"docs: Fixing incorrect div tags in l10n N docs\" into nyc-dev
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

8 years agodocs: Fixing incorrect div tags in l10n N docs
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

8 years agoMerge "docs: Fixing incorrect div tags in l10n N docs" into nyc-dev
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

8 years agocherry-pick from mnc-mr-docs: docs: SafeBrowsing API
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

8 years agoMerge \\"Fix the API compatibility of \\"UriMatcher#addURI\\"\\" am: 3e151273a3
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

8 years agoMerge \"Fix the API compatibility of \"UriMatcher#addURI\"\"
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

8 years agoMerge "Fix the API compatibility of "UriMatcher#addURI""
Fyodor Kupolov [Mon, 1 Aug 2016 17:34:32 +0000 (17:34 +0000)]
Merge "Fix the API compatibility of "UriMatcher#addURI""

8 years agodocs: Fixing incorrect div tags in l10n N docs
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

8 years agodocs: Update Android Dashboard for August 2016 am: 3d1cd9d2da
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

8 years agodocs: Update Android Dashboard for August 2016
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

8 years agodocs: Update Android Dashboard for August 2016
Joe Fernandez [Mon, 1 Aug 2016 16:10:29 +0000 (09:10 -0700)]
docs: Update Android Dashboard for August 2016

Change-Id: I6e5d35a3f3ed4f79f7acd485fc66f250d90f828a

8 years agoRename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite
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

8 years agoMerge \\\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\\" into lmp-dev am: 124cc534f...
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

8 years agoMerge \\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\" into lmp-dev am: 124cc534f8...
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

8 years agoMerge \\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\" into lmp-dev am: 124cc534f8...
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

8 years agoDO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062...
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

8 years agoMerge \\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\" into lmp-dev am: 124cc534f8...
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

8 years agoDO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062...
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

8 years agoDO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062...
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

8 years agoMerge \\\\\"DO NOT MERGE: Fix CTS regression\\\\\" into lmp-dev am: 124cc534f8 ...
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

8 years agoMerge \\\\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getPr...
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

8 years agoDO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoMerge \\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfi...
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

8 years agoMerge \\\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getPro...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoDO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062...
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

8 years agoMerge \\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfil...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoMerge \\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProf...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoMerge \\\\"DO NOT MERGE: Fix CTS regression\\\\" into lmp-dev am: 124cc534f8 -s...
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

8 years agoDO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c
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

8 years agoMerge \\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfile...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoMerge \\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfi...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoMerge \\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfil...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoMerge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoMerge \\\"DO NOT MERGE: Fix CTS regression\\\" into lmp-dev am: 124cc534f8 -s ours...
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

8 years agoDO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95
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

8 years agoMerge \\"DO NOT MERGE: Fix CTS regression\\" into lmp-dev am: 124cc534f8 -s ours
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

8 years agoDO NOT MERGE: Fix CTS regression am: edc9238514 -s ours
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

8 years agoMerge \\"docs: Improved Google Play Developer Console documentation\\" into nyc-docs...
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

8 years agodocs: Improved Google Play Developer Console documentation am: ec8b21a27a
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

8 years agoMerge \"Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into nyc-dev
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

8 years agoAllow apps with CREATE_USERS permission to call UM.getProfiles.
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

8 years agoMerge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
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

8 years agoMerge \\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfile...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoMerge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am...
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

8 years agoMerge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles...
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

8 years agoDO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
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

8 years agoMerge \"docs: Improved Google Play Developer Console documentation\" into nyc-docs
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

8 years agodocs: Improved Google Play Developer Console documentation
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

8 years agoMerge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev
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

8 years agoDO NOT MERGE: Fix CTS regression
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

8 years agoFix the API compatibility of "UriMatcher#addURI"
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

8 years agoMerge "DO NOT MERGE: Fix CTS regression" into lmp-dev
Sungsoo Lim [Fri, 29 Jul 2016 23:18:51 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev

8 years agoMerge "docs: Improved Google Play Developer Console documentation" into nyc-docs
Kevin Hufnagle [Fri, 29 Jul 2016 22:01:18 +0000 (22:01 +0000)]
Merge "docs: Improved Google Play Developer Console documentation" into nyc-docs

8 years agoMerge "Allow apps with CREATE_USERS permission to call UM.getProfiles." into nyc-dev
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

8 years agoMerge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles...
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

8 years agoMerge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles...
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

8 years agoMerge \\"docs: fix escaped characters in data binding doc\\" into nyc-docs am: 4172905146
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

8 years agodocs: fix escaped characters in data binding doc am: 011c07bd80
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

8 years agoDO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s...
Sungsoo Lim [Fri, 29 Jul 2016 20:55:43 +0000 (20:55 +0000)]
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472  -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0  -s ours
am: 53e9affbf9

Change-Id: Ic185caf8064a4077fafb5046e7b4a15de2d0122b

8 years agoMerge \"docs: fix escaped characters in data binding doc\" into nyc-docs
Mark Lu [Fri, 29 Jul 2016 20:54:47 +0000 (20:54 +0000)]
Merge \"docs: fix escaped characters in data binding doc\" into nyc-docs
am: 4172905146

Change-Id: I89e1aeade45c0faf78f569eda75a98f1cf81b773

8 years agodocs: fix escaped characters in data binding doc
Mark Lu [Fri, 29 Jul 2016 20:54:45 +0000 (20:54 +0000)]
docs: fix escaped characters in data binding doc
am: 011c07bd80

Change-Id: I319973e92d7e3687c240b71783add9c74af478ce

8 years agoMerge "docs: fix escaped characters in data binding doc" into nyc-docs
Mark Lu [Fri, 29 Jul 2016 20:41:08 +0000 (20:41 +0000)]
Merge "docs: fix escaped characters in data binding doc" into nyc-docs

8 years agoDO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s...
Sungsoo Lim [Fri, 29 Jul 2016 20:37:47 +0000 (20:37 +0000)]
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472  -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8
am: 49f14fa7e0  -s ours

Change-Id: I2e6b505b24592dbcbc23e4d8c4025ad9972b73ad

8 years agodocs: Improved Google Play Developer Console documentation
Kevin Hufnagle [Thu, 30 Jun 2016 23:49:15 +0000 (16:49 -0700)]
docs: Improved Google Play Developer Console documentation

The "In-app Promotions," "Preparing Your In-app Billing Application,"
"In-app Billing Overview," and "Developer Console" pages now contain
up-to-date content and use a cleaner writing style.

Bug: 29358568
Change-Id: I0d21fba8ef6bedbacdb38e7a5203041e79cb455f

8 years agoDO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s...
Sungsoo Lim [Fri, 29 Jul 2016 20:10:28 +0000 (20:10 +0000)]
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472  -s ours am: e0316fc7a8 am: bfdf9592d0
am: 59cb7ab7b8

Change-Id: I166f91e72d1da65610d0f7d697dd70ddb9cfe96a

8 years agoDO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s...
Sungsoo Lim [Fri, 29 Jul 2016 20:03:48 +0000 (20:03 +0000)]
DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54  -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2  -s ours
am: cd17df0011

Change-Id: I2b2918e853613959e09a6e0cb005072a831b1c84

8 years agoDO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s...
Sungsoo Lim [Fri, 29 Jul 2016 19:54:42 +0000 (19:54 +0000)]
DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54  -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035
am: d056456fe2  -s ours

Change-Id: Ifb5115f0efac94fbbbb622d442bd32c49df085f5

8 years agoDO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s...
Sungsoo Lim [Fri, 29 Jul 2016 19:52:34 +0000 (19:52 +0000)]
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472  -s ours am: e0316fc7a8
am: bfdf9592d0

Change-Id: I2ceb67ac584b8fe681ffcb812ebff2f8d7ae721e

8 years agoDO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s...
Sungsoo Lim [Fri, 29 Jul 2016 19:48:00 +0000 (19:48 +0000)]
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472  -s ours
am: e0316fc7a8

Change-Id: I0047256a9e88bedc24389de46c0e9f92430fe607

8 years agoDO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am...
Sungsoo Lim [Fri, 29 Jul 2016 19:47:51 +0000 (19:47 +0000)]
DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7  -s ours
am: 204fdc49fc

Change-Id: I923456f924901516f86504ba25699ae38d1c205c

8 years agoDO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s...
Sungsoo Lim [Fri, 29 Jul 2016 19:46:13 +0000 (19:46 +0000)]
DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54  -s ours am: 0bbdc37b60 am: 25782fae9b
am: dd2ec80035

Change-Id: I27b22faf8d6ad4bba039a1eca699bd4163c2ad6a

8 years agoDO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s...
Sungsoo Lim [Fri, 29 Jul 2016 19:35:54 +0000 (19:35 +0000)]
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a am: b6a3e8ce8e
am: b8d3dd2472  -s ours

Change-Id: I3875a28849df618a392a88480271bf1ac8ef776e

8 years agoDO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s...
Sungsoo Lim [Fri, 29 Jul 2016 19:24:37 +0000 (19:24 +0000)]
DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54  -s ours am: 0bbdc37b60
am: 25782fae9b

Change-Id: I9fe008924b75ac7d348e0aa8c478f859a4ed743b

8 years agoDO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935
Sungsoo Lim [Fri, 29 Jul 2016 19:21:41 +0000 (19:21 +0000)]
DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935
am: e71159c5f7  -s ours

Change-Id: I0b07f82bf5df950dd03ff93d863033ea23510186

8 years agoDO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s...
Sungsoo Lim [Fri, 29 Jul 2016 19:14:02 +0000 (19:14 +0000)]
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a
am: b6a3e8ce8e

Change-Id: I51997dc68fc55e523050b4e642cdc4a22cd60f09

8 years agoDO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s...
Sungsoo Lim [Fri, 29 Jul 2016 19:03:14 +0000 (19:03 +0000)]
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours
am: 2dbb64594a

Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4