Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Brubaker
5204f17fcc Merge "Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca am: 62ac808954" into nyc-mr1-dev-plus-aosp 
am: 6367c659af

* commit '6367c659af6737a781c7d6287ffd724f79f74510':
  Track changes to network security config manifest configuration

Change-Id: Iec52e971a28110eab0b29124e708e1d1379f1426
 2016-05-26 05:44:08 +00:00
Joe Fernandez
5414dc989b Merge "Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 am: 68fb46153f am: f075d977a3" into nyc-mr1-dev-plus-aosp 
am: 45dddfa8f1

* commit '45dddfa8f14174044cef4ddb431f5a7aaba64892':

Change-Id: I9b333c9961db892544685586f5a07a0eccbc1751
 2016-05-26 05:43:55 +00:00
Joe Fernandez
f1ac67b5d4 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 am: 68fb46153f am: 67f2e2cc90 
am: 1339775565

* commit '133977556519bf2c217d1a180363d1f82132981b':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: I96d1595d365235b72a169f11e2c9562b632c2787
 2016-05-26 05:43:38 +00:00
Dirk Dougherty
1cf99365cb Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a 
am: a7c0788467

* commit 'a7c0788467d865e72ddbaa5862382d8ecc164039':
  Remove spurious url reference.

Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f
 2016-05-26 05:35:46 +00:00
Android Build Merger (Role)
fcbff62ddd Merge "Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca am: c8f0324f15" into nyc-mr1-dev-plus-aosp 2016-05-26 05:18:07 +00:00
Android Build Merger (Role)
6367c659af Merge "Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca am: 62ac808954" into nyc-mr1-dev-plus-aosp 2016-05-26 05:18:01 +00:00
Android Build Merger (Role)
45dddfa8f1 Merge "Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 am: 68fb46153f am: f075d977a3" into nyc-mr1-dev-plus-aosp 2016-05-26 05:17:54 +00:00
Chad Brubaker
bfec1e18a3 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca 
am: c8f0324f15

* commit 'c8f0324f15b16c928095f73f010abd4bf6b14a71':
  Track changes to network security config manifest configuration

Change-Id: Iea73306dad56f48dbd5d3ad46e7d6ed58ac96ec7
 2016-05-26 05:17:21 +00:00
Chad Brubaker
2fbded264d Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca 
am: 62ac808954

* commit '62ac808954617a30512abe0cd07068bdbae5a314':
  Track changes to network security config manifest configuration

Change-Id: Ib3190c6b57a49c2984e25e3b539589649bddb002
 2016-05-26 05:17:12 +00:00
Joe Fernandez
ad88e89e1e Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 am: 68fb46153f 
am: f075d977a3

* commit 'f075d977a38af54f8b1890f40b2aa253923d4a89':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: Ie009ea200c841fb38aa6b738aa12cb9ab7d84374
 2016-05-26 05:17:12 +00:00
Joe Fernandez
1339775565 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 am: 68fb46153f 
am: 67f2e2cc90

* commit '67f2e2cc908635307d824772aada7a6db42fe927':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: I204755f4797c768954b330b374ae3fabe5a97de2
 2016-05-26 05:17:03 +00:00
Dirk Dougherty
a7c0788467 Merge "Remove spurious url reference." into mnc-mr-docs 
am: 1ed701493a

* commit '1ed701493a6363c58b86de8dac600fca990a131a':
  Remove spurious url reference.

Change-Id: I6b304fe5f87804f9c0d4de9bfef92437810ac9ea
 2016-05-26 05:17:01 +00:00
Hyunyoung Song
38fdd605c8 Replace caribou wallpaper without the stars 
b/28339724

Change-Id: I1c7f9024ffbdd51f675996ef156bc4882588da30
 2016-05-25 22:10:55 -07:00
Dirk Dougherty
1ed701493a Merge "Remove spurious url reference." into mnc-mr-docs 2016-05-26 05:03:25 +00:00
Chad Brubaker
62ac808954 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 
am: 86bceb87ca

* commit '86bceb87ca8177200977024f4757edaf1233d4be':
  Track changes to network security config manifest configuration

Change-Id: Id4b8b2a06cd2cbebcd47964e05157199c9cf9b31
 2016-05-26 05:00:35 +00:00
Joe Fernandez
67f2e2cc90 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 
am: 68fb46153f

* commit '68fb46153f8649e2d4027a5e79cfc1786764a746':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: I7ff0d7995f26d9e47609322f91a9ac71c9b2b80d
 2016-05-26 05:00:12 +00:00
Chad Brubaker
c8f0324f15 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 
am: 86bceb87ca

* commit '86bceb87ca8177200977024f4757edaf1233d4be':
  Track changes to network security config manifest configuration

Change-Id: Ibd6b8e86ec89c3ba0e8c84289255eaef23dcc3b3
 2016-05-26 04:59:41 +00:00
Joe Fernandez
f075d977a3 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 
am: 68fb46153f

* commit '68fb46153f8649e2d4027a5e79cfc1786764a746':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: I5b0b5eea9e11c88aee9bb91e2e1b38ba2c9042c0
 2016-05-26 04:59:32 +00:00
Chad Brubaker
86bceb87ca Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 
am: 11b56641e5

* commit '11b56641e5e466f5ca14bd118e819c3f04820d38':
  Track changes to network security config manifest configuration

Change-Id: I25e463154d084223dbafdf3e2ab99bfdb52769fb
 2016-05-26 04:47:44 +00:00
Joe Fernandez
68fb46153f Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 
am: 1a045584d4

* commit '1a045584d44030947793f2a48953ce54ff2df0c6':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: If2ede00cf1ab2bdb178eed09ec6f9cd6d28f8820
 2016-05-26 04:47:34 +00:00
Chad Brubaker
11b56641e5 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs 
am: ce99e3c571

* commit 'ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
  Track changes to network security config manifest configuration

Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e
 2016-05-26 04:37:17 +00:00
Joe Fernandez
1a045584d4 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs 
am: 9e823c7048

* commit '9e823c7048bce9373fd5ccf10003b2eb05175b2b':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: Ie5649d42ece35f36130abefd00c3a53d5252cd03
 2016-05-26 04:37:09 +00:00
Seigo Nonaka
8b29f2e636 Merge "Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 am: 005ef10518" into nyc-mr1-dev-plus-aosp 
am: 908b765ba2

* commit '908b765ba21952268baa4de53d84fb907381371d':

Change-Id: Ie651d8e8ebb64546e7563958bc81d0baf95e0e04
 2016-05-26 04:34:34 +00:00
Seigo Nonaka
a0cb2c4931 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 am: b03e7217f3 
am: d34ca400c6

* commit 'd34ca400c6f8cd25827e0278dd9062d82b0fbf08':
  Fix system locale propagation during user creation.

Change-Id: I41229dce52266d59c3b3334e2d4ae390b75bbe20
 2016-05-26 04:34:26 +00:00
Android Build Merger (Role)
ce99e3c571 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs 2016-05-26 04:26:33 +00:00
Joe Fernandez
9e823c7048 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs 2016-05-26 04:26:25 +00:00
Chad Brubaker
094e1470d9 Merge "Track changes to network security config manifest configuration" into mnc-mr-docs 
am: c0f99aebdc

* commit 'c0f99aebdc7c803600e12cbe0d940219069eb066':
  Track changes to network security config manifest configuration

Change-Id: I46fc434934428ffbdfd7816c0a3b2590f97d4713
 2016-05-26 04:26:11 +00:00
Android Build Merger (Role)
908b765ba2 Merge "Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 am: 005ef10518" into nyc-mr1-dev-plus-aosp 2016-05-26 04:18:14 +00:00
Seigo Nonaka
6342fbab90 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 
am: 005ef10518

* commit '005ef10518adb9768ad6569f0c6b42db949083d4':
  Fix system locale propagation during user creation.

Change-Id: Ibbfebbfb28321bbd7275461b9e8d112577e05620
 2016-05-26 04:17:47 +00:00
Seigo Nonaka
d34ca400c6 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 
am: b03e7217f3

* commit 'b03e7217f3fa3144f69119a4e109cce934d6065a':
  Fix system locale propagation during user creation.

Change-Id: I6955bad489926525f6b50709bcf14b829ca9392d
 2016-05-26 04:17:39 +00:00
Chad Brubaker
c0f99aebdc Merge "Track changes to network security config manifest configuration" into mnc-mr-docs 2016-05-26 04:09:40 +00:00
Seigo Nonaka
b03e7217f3 Merge "Fix system locale propagation during user creation." into nyc-dev 
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
  Fix system locale propagation during user creation.

Change-Id: If31dcbe28d108ec12aa9f4aef4382dcb2da90aaf
 2016-05-26 04:07:40 +00:00
Seigo Nonaka
005ef10518 Merge "Fix system locale propagation during user creation." into nyc-dev 
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
  Fix system locale propagation during user creation.

Change-Id: I020babcf2ce1aa632099457f2baf3497f5ac2946
 2016-05-26 04:07:33 +00:00
Seigo Nonaka
ce9f5e3657 Merge "Fix system locale propagation during user creation." into nyc-dev 2016-05-26 03:51:39 +00:00
Dirk Dougherty
3930b5091e Remove spurious url reference. 
Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f
 2016-05-25 20:29:59 -07:00
Trevor Johns
7f0dae9491 Merge "docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e am: 6e73a12804" into nyc-mr1-dev-plus-aosp 
am: f2a8ea9523

* commit 'f2a8ea95234d20b2e0a29f40ed0266d6be1106b4':

Change-Id: I462f91a4389e0b85a016b4984d68fb7de19ee374
 2016-05-26 03:22:35 +00:00
Trevor Johns
535a362bab docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e am: e135e9b1b7 
am: 5c6eac02e4

* commit '5c6eac02e4821a52a6df0c105313b8f279bc9ca4':
  docs: Fix broken link in Volley training

Change-Id: I21e17306ed89ab8a0dd2848afe5bd08c6e4dbce8
 2016-05-26 03:19:02 +00:00
Wyatt Riley
c8f13d504f Prevent use of a null sCallbackObj by Hardware FLP 
Bug: 28730136
Change-Id: I5898583e8108c4cfa8574a0adc5b50d6983b247e
 2016-05-25 20:01:22 -07:00
Android Build Merger (Role)
f2a8ea9523 Merge "docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e am: 6e73a12804" into nyc-mr1-dev-plus-aosp 2016-05-26 02:48:46 +00:00
Trevor Johns
1b37a3e851 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e 
am: 6e73a12804

* commit '6e73a12804276d95c96fc66a80b2693a9bf35652':
  docs: Fix broken link in Volley training

Change-Id: I60c8e6c9c6a26fafe290105f9d64061d694ecc1b
 2016-05-26 02:48:16 +00:00
Trevor Johns
5c6eac02e4 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e 
am: e135e9b1b7

* commit 'e135e9b1b7060b618febf35082d42148e8e38afb':
  docs: Fix broken link in Volley training

Change-Id: I5e0a61ee98e45d71b5d796f0fa1418b8ddab87f2
 2016-05-26 02:48:14 +00:00
Adam Lesinski
63f741a97e Merge "Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a am: ade0bce32a" into nyc-mr1-dev-plus-aosp 
am: 27bc36a8bc

* commit '27bc36a8bc918e1204054633951feeff9c370ff4':

Change-Id: Ic8260551317c2148f9faede2a742dffde921b533
 2016-05-26 02:45:22 +00:00
Adam Lesinski
e3b163035d Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a am: fbdf46f663 
am: 0c2f681bdf

* commit '0c2f681bdfacc5504c101945d5421f892184a007':
  Use app's best locale if they override LocaleList

Change-Id: I9913e7466450a83bd5872abc62cfaac3d235d8d8
 2016-05-26 02:45:13 +00:00
Trevor Johns
e135e9b1b7 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 
am: 5513b6776e

* commit '5513b6776e0b00fd0444cf4f964451d0ef61a511':
  docs: Fix broken link in Volley training

Change-Id: Ia030a066b44dfd842a8ea411001dbf454003fb20
 2016-05-26 02:36:42 +00:00
Trevor Johns
6e73a12804 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 
am: 5513b6776e

* commit '5513b6776e0b00fd0444cf4f964451d0ef61a511':
  docs: Fix broken link in Volley training

Change-Id: Iae7c07a4734cd822c13ba8a78d5bc8b311432eb9
 2016-05-26 02:36:37 +00:00
Adam Powell
657b3901ef Merge "Merge "N is API 24" into nyc-dev am: bc983c4431 am: 528a5bd466" into nyc-mr1-dev-plus-aosp 
am: a96bd319c6

* commit 'a96bd319c6032c99a57ab3b8ab212d2793c98777':

Change-Id: I83bf4eba7a2b2edcb62d79c4764635b88c138d2a
 2016-05-26 02:23:36 +00:00
Adam Powell
8c6e691c09 Merge "N is API 24" into nyc-dev am: bc983c4431 am: 0b478d5b05 
am: 3579a6a634

* commit '3579a6a63474918be6d7d3df21bcf132e8dc0e54':
  N is API 24

Change-Id: I15afe037702682bb124355b8da31af37444ded2b
 2016-05-26 02:21:03 +00:00
Trevor Johns
5513b6776e docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e 
am: 46c1d5a5d2

* commit '46c1d5a5d2b4c1d6a680f7af5c3973486c1fef2c':
  docs: Fix broken link in Volley training

Change-Id: Ib5ae3925cca39db0145bb4c6e6eeb53488bfc316
 2016-05-26 02:19:23 +00:00
Android Build Merger (Role)
27bc36a8bc Merge "Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a am: ade0bce32a" into nyc-mr1-dev-plus-aosp 2016-05-26 02:18:47 +00:00
Adam Lesinski
afb018e836 Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a 
am: ade0bce32a

* commit 'ade0bce32ae9dbacccf8d75695cda99b56a014f3':
  Use app's best locale if they override LocaleList

Change-Id: Ib573235d174892c714e6864d8f34ac3a909b2d1c
 2016-05-26 02:18:05 +00:00