Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252,476 Commits 3 Branches 0 Tags
ef894f68fc1be813b157f4b45e631393be4eb00a
Commit Graph

252476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amanda Kassay
ef894f68fc Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef am: af218df0be am: 5295a81926 am: c5484969b4 
am: 9ded33a4c7

* commit '9ded33a4c7e4d4990284ada2c2976a1636cad50e':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: I8dffaf57087e691fa906d3045945402a62eefc33
 2016-05-11 17:56:03 +00:00
Amanda Kassay
9ded33a4c7 Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef am: af218df0be am: 5295a81926 
am: c5484969b4

* commit 'c5484969b4e52e027bd92adec3486cbc5dd7737d':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: I18d0d2423e29be4f61bb92f81b24502e223f33a5
 2016-05-11 17:52:44 +00:00
Amanda Kassay
c5484969b4 Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef am: af218df0be 
am: 5295a81926

* commit '5295a81926321bcb7059f645728e021264131227':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: I4cdefd1ed0a858404428058b46edaf2eabc3f752
 2016-05-11 17:49:55 +00:00
Android Build Merger (Role)
33eb610b2b Merge "Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev am: f2413b79c6 am: 10601fa8bd" into nyc-mr1-dev-plus-aosp 2016-05-11 17:49:54 +00:00
Ben Lin
0d173b620b Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev am: f2413b79c6 
am: 10601fa8bd

* commit '10601fa8bd71be9e69fa7642ee286436368e8e81':

Change-Id: Ib381f3bc52e99f2b4086de4aaa792718268eb71a
 2016-05-11 17:49:32 +00:00
Android Build Merger (Role)
b145134ed9 Merge "Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev am: f2413b79c6 am: 10601fa8bd" into nyc-mr1-dev-plus-aosp 2016-05-11 17:47:40 +00:00
Ben Lin
0d8d188a06 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev am: f2413b79c6 
am: 10601fa8bd

* commit '10601fa8bd71be9e69fa7642ee286436368e8e81':
  Removed duplicate call to Metric log, and using private logging method.

Change-Id: I007857278ba5c8b62482f805ac54f502ba345869
 2016-05-11 17:47:15 +00:00
Amanda Kassay
5295a81926 Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef 
am: af218df0be

* commit 'af218df0be999d5aa08e580fc237c35eecc11839':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: Ie452073f4f159ea4210de3d8ff6c9a7a34a543fa
 2016-05-11 17:47:07 +00:00
Ben Lin
ff23546c2c Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev am: f2413b79c6 
am: 6974295274

* commit '69742952746bbd86cde45a15e84635937d1dbd66':
  Removed duplicate call to Metric log, and using private logging method.

Change-Id: I9040fd2c07268209ef8d668965443f82a79fbcb0
 2016-05-11 17:47:01 +00:00
Amanda Kassay
af218df0be Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs 
am: 965f4bf1ef

* commit '965f4bf1ef2e8958ec9a53bab00be919a49bc8c2':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: If2a4f83aadd1994c86c34a9443cf50af96b633d6
 2016-05-11 17:44:06 +00:00
Ben Lin
10601fa8bd Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 
am: f2413b79c6

* commit 'f2413b79c6e8f0b23b84c08806cca9c8c01959b5':
  Removed duplicate call to Metric log, and using private logging method.

Change-Id: I9c2af4839ceb15559f8ff5154c84bb03442a441b
 2016-05-11 17:44:05 +00:00
Ben Lin
6974295274 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 
am: f2413b79c6

* commit 'f2413b79c6e8f0b23b84c08806cca9c8c01959b5':
  Removed duplicate call to Metric log, and using private logging method.

Change-Id: I497f0822da0d42d59b025623e61167aa5d157396
 2016-05-11 17:44:05 +00:00
Android Build Merger (Role)
32247c4c73 Merge "Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev am: 20ed211fbc am: ae36204824" into nyc-mr1-dev-plus-aosp 2016-05-11 17:43:35 +00:00
Sid Soundararajan
46388d8574 Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev am: 20ed211fbc 
am: ae36204824

* commit 'ae362048249186877322fc5222ba84e7ca147193':

Change-Id: I8ce8bab7cd203f7c67f1a9198861497f429ca003
 2016-05-11 17:43:13 +00:00
Android Build Merger (Role)
398bf0b7c5 Merge "Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev am: 20ed211fbc am: ae36204824" into nyc-mr1-dev-plus-aosp 2016-05-11 17:41:29 +00:00
Sid Soundararajan
693fe2325b Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev am: 20ed211fbc 
am: ae36204824

* commit 'ae362048249186877322fc5222ba84e7ca147193':
  Remove Graphic from No Recents Screen on TV.

Change-Id: I2e7f007d28069635bfb0f2db89d6556438a8bf9b
 2016-05-11 17:41:02 +00:00
Sid Soundararajan
854df5811e Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev am: 20ed211fbc 
am: 85a0821914

* commit '85a08219141f5d2be3b8fd74bff6e0c57bf47bde':
  Remove Graphic from No Recents Screen on TV.

Change-Id: Ic7530c22a282bc4f36ad1f95501ef1629597460d
 2016-05-11 17:40:56 +00:00
Sid Soundararajan
85a0821914 Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev 
am: 20ed211fbc

* commit '20ed211fbcac476f0b84e68b039f00a54e5c7351':
  Remove Graphic from No Recents Screen on TV.

Change-Id: I33b50a92e08f3ecf5c4fbd334ea989d50c7c075f
 2016-05-11 17:38:10 +00:00
Sid Soundararajan
ae36204824 Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev 
am: 20ed211fbc

* commit '20ed211fbcac476f0b84e68b039f00a54e5c7351':
  Remove Graphic from No Recents Screen on TV.

Change-Id: I7241317e16ede52aebe46764b15599df2d4c4157
 2016-05-11 17:38:07 +00:00
Amanda Kassay
965f4bf1ef Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs 2016-05-11 17:37:46 +00:00
Ben Lin
f2413b79c6 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 2016-05-11 17:36:26 +00:00
Android Build Merger (Role)
c4fd908ebe Merge "Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad am: 47e0d29473" into nyc-mr1-dev-plus-aosp 2016-05-11 17:33:04 +00:00
Android Build Merger (Role)
45785aa160 Merge "Merge "Swap radio button alphas." into nyc-dev am: 0ccd9cef14 am: ea7a6db175" into nyc-mr1-dev-plus-aosp 2016-05-11 17:32:54 +00:00
Julia Reynolds
54ee965c0a Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad 
am: 47e0d29473

* commit '47e0d29473f529e39fa124a452e1d3677f4b7ea1':

Change-Id: Ib57d4f5ffdce9be18f36af336f88c663c360d70d
 2016-05-11 17:32:30 +00:00
Julia Reynolds
4dc1e372e0 Merge "Swap radio button alphas." into nyc-dev am: 0ccd9cef14 
am: ea7a6db175

* commit 'ea7a6db175a9520765114e91953b9757a4e1e65d':

Change-Id: Ibb8a4fc5ccaf8d3cec455a7459ac5b55cec2bd6c
 2016-05-11 17:32:26 +00:00
Android Build Merger (Role)
8eb23ed347 Merge "Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad am: 47e0d29473" into nyc-mr1-dev-plus-aosp 2016-05-11 17:30:34 +00:00
Android Build Merger (Role)
3dc2dc483d Merge "Merge "Swap radio button alphas." into nyc-dev am: 0ccd9cef14 am: ea7a6db175" into nyc-mr1-dev-plus-aosp 2016-05-11 17:30:23 +00:00
Android Build Merger (Role)
f5b62afe86 Merge "Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad am: b15ecad14c" into nyc-mr1-dev-plus-aosp 2016-05-11 17:30:17 +00:00
Android Build Merger (Role)
8e0a306c13 Merge "Merge "Swap radio button alphas." into nyc-dev am: 0ccd9cef14 am: 625f551851" into nyc-mr1-dev-plus-aosp 2016-05-11 17:30:05 +00:00
Julia Reynolds
0f4fe1ecbb Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad 
am: 47e0d29473

* commit '47e0d29473f529e39fa124a452e1d3677f4b7ea1':
  Do not bundle cross user.

Change-Id: Iddb69301221d26a7e06b4e9e639a0ac1a23339d2
 2016-05-11 17:29:50 +00:00
Julia Reynolds
b1aa64ba20 Merge "Swap radio button alphas." into nyc-dev am: 0ccd9cef14 
am: ea7a6db175

* commit 'ea7a6db175a9520765114e91953b9757a4e1e65d':
  Swap radio button alphas.

Change-Id: Idef9cea34be27df3687454a4106c275a23f14b80
 2016-05-11 17:29:45 +00:00
Julia Reynolds
35410a4128 Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad 
am: b15ecad14c

* commit 'b15ecad14c8eb9fbf00ffb82c6d5dea37dabcc80':
  Do not bundle cross user.

Change-Id: I54f3d8b36617f5a9294d119a76b19cba0b9793b2
 2016-05-11 17:29:42 +00:00
Julia Reynolds
4b162fb5ad Merge "Swap radio button alphas." into nyc-dev am: 0ccd9cef14 
am: 625f551851

* commit '625f551851da235bf6e65385ecfdc4b18f237941':
  Swap radio button alphas.

Change-Id: I3838daffd754f40132095962d3c55fc2e24ecda0
 2016-05-11 17:29:38 +00:00
Sid Soundararajan
20ed211fbc Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev 2016-05-11 17:29:31 +00:00
Julia Reynolds
b15ecad14c Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: Ifa9198643939c69493a0ae406f48437d3bf94bd7
 2016-05-11 17:27:03 +00:00
Julia Reynolds
47e0d29473 Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: I138954f6b417997fd2e6d7f8bd96e8c0ad7ff2a5
 2016-05-11 17:26:59 +00:00
Julia Reynolds
625f551851 Merge "Swap radio button alphas." into nyc-dev 
am: 0ccd9cef14

* commit '0ccd9cef14c6804459cc1824a067afb2c7604e8e':
  Swap radio button alphas.

Change-Id: Ic725466efe7bf7871452caabee7ea24ff5fff131
 2016-05-11 17:26:59 +00:00
Julia Reynolds
ea7a6db175 Merge "Swap radio button alphas." into nyc-dev 
am: 0ccd9cef14

* commit '0ccd9cef14c6804459cc1824a067afb2c7604e8e':
  Swap radio button alphas.

Change-Id: I1a52ed1fd9480e00cfc183524b55447717bb9c86
 2016-05-11 17:26:56 +00:00
Android Build Merger (Role)
4e54215e8a Merge "Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 am: 1b59797ce5 am: 838a8280f8 am: 3455280b93" into nyc-mr1-dev-plus-aosp 2016-05-11 17:24:18 +00:00
Cheryl Potter
2fd62d50c0 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 am: 1b59797ce5 am: 838a8280f8 
am: 3455280b93

* commit '3455280b93db44e079f6e8536650196b43c56d9f':

Change-Id: I8238e79cbb46076d5d5f54ed7c92f78c5f7f051d
 2016-05-11 17:23:55 +00:00
Android Build Merger (Role)
21246c39cb Merge "Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 am: 1b59797ce5 am: 838a8280f8 am: 3455280b93" into nyc-mr1-dev-plus-aosp 2016-05-11 17:22:09 +00:00
Cheryl Potter
5885d0e91f Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 am: 1b59797ce5 am: 838a8280f8 
am: 3455280b93

* commit '3455280b93db44e079f6e8536650196b43c56d9f':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I572ab943be5e9f3c5f3defbc1ea710a8a3c4de92
 2016-05-11 17:21:44 +00:00
Cheryl Potter
fd333b2f92 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 am: 1b59797ce5 am: 838a8280f8 
am: 0c1063836f

* commit '0c1063836f902afbf2fa24b2f5965e053e20d7d3':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: Ida40151f19ab74762deb30343f5f40907fce40eb
 2016-05-11 17:21:42 +00:00
Julia Reynolds
68a32b5aad Merge "Do not bundle cross user." into nyc-dev 2016-05-11 17:20:16 +00:00
Julia Reynolds
0ccd9cef14 Merge "Swap radio button alphas." into nyc-dev 2016-05-11 17:19:12 +00:00
Cheryl Potter
0c1063836f Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 am: 1b59797ce5 
am: 838a8280f8

* commit '838a8280f83469e062316ae29a88559c98864454':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I14ea4b7b7eb4a184a1b52f2ac6f52fdc00f4f0b9
 2016-05-11 17:18:52 +00:00
Cheryl Potter
3455280b93 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 am: 1b59797ce5 
am: 838a8280f8

* commit '838a8280f83469e062316ae29a88559c98864454':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I75df34722f452be960e31351b95036621895c659
 2016-05-11 17:18:50 +00:00
Cheryl Potter
838a8280f8 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 
am: 1b59797ce5

* commit '1b59797ce56e080847f6b635dc5e92707ac45fb4':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I99842f49b7d7c927b8c720b3e161ec488c8c3cee
 2016-05-11 17:16:20 +00:00
Cheryl Potter
1b59797ce5 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 
am: 5c273ba194

* commit '5c273ba194deab8b0dc73b9632b936b7f088e7ac':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I651132147c73a9b96373c688a34437bf1d557c87
 2016-05-11 17:13:34 +00:00
Cheryl Potter
5c273ba194 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs 
am: ae08263ac8

* commit 'ae08263ac81277ad25a84cc3a30917f8f78a3153':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I59128f6ff32ffab60e5e1dd43d8008d7d7d470e8
 2016-05-11 17:10:48 +00:00