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

266821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stuart Scott
d244fb815e Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev am: 56760c65df 
am: 027e2d204e

* commit '027e2d204ed56288eb3e2b00fec4fef28bbee1c6':
  Add carrier config key for carrier setup app.

Change-Id: I0cb5a9c4fb23daf7e1b5a1414f473ffbf771a117
 2016-06-06 20:29:18 +00:00
Jae Seo
47eeb3246a Merge "Merge "TIF: Set the surface secure" into nyc-dev am: 9675f16bba am: 6cb63622e3" into nyc-mr1-dev-plus-aosp 
am: 265787fded

* commit '265787fdedecb2eafb95332fd934875cfc665a97':

Change-Id: I81ab4e6017a6eeb1eac024d91e9d9c0f35d9d89b
 2016-06-06 20:28:59 +00:00
Jae Seo
eed721c3bb Merge "TIF: Set the surface secure" into nyc-dev am: 9675f16bba am: 711ae66a4b 
am: 9aa6e93aba

* commit '9aa6e93abaebba22fa3f3592fa0c4eef84b780ea':
  TIF: Set the surface secure

Change-Id: I4ec13078760c33196c9db7ab82d3f38443b86516
 2016-06-06 20:28:55 +00:00
smain@google.com
67f0e2897a add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe am: 78483fdc3d am: 894e7b6f78 am: 345d292e9a 
am: e22fa7266a

* commit 'e22fa7266a32881767a5bfd11a1348e2c67ff51a':

Change-Id: Ia32bc3dba69b83073e79790d464af281588ecf58
 2016-06-06 20:28:48 +00:00
smain@google.com
0fc9224b61 add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe am: 78483fdc3d am: 894e7b6f78 am: 8730f3a1d1 
am: d2396d3505

* commit 'd2396d3505e29de9c8af096d00416e9fc04c2bad':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: Ia54b4284ff4062c1f7d628fb457bc4beef52f763
 2016-06-06 20:26:22 +00:00
Adarsh Fernando
4ca3dde0ce Merge "Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev am: 90eece4a77 am: 8a95c3d6d3" into nyc-mr1-dev-plus-aosp 
am: 08b717f4d6

* commit '08b717f4d638ff7f43a9364c4e8d7ad5e81cf393':

Change-Id: I935cc92986d015229cbfb56de2dfdf3cd531580b
 2016-06-06 20:26:20 +00:00
Adarsh Fernando
2d16991459 Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev am: 90eece4a77 am: 20df38dda9 
am: ca2c5de149

* commit 'ca2c5de149fe4f765c169543f98367edbe4b9be7':
  DOCS: Updated Java 8 language support list with Type Annotations.

Change-Id: I4060f2fa34e1d84275973a6d267b6689e168492d
 2016-06-06 20:26:17 +00:00
Guang Zhu
729197b368 Merge "Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev am: 56cf05291e am: 28a6a3f435" into nyc-mr1-dev-plus-aosp 
am: e5c466b730

* commit 'e5c466b730751928d2dc6cb18a8410d54d2d9bd2':

Change-Id: If437d49e29489fe2cd81044da06c50bc6620584d
 2016-06-06 20:26:15 +00:00
Guang Zhu
462211ef14 Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev am: 56cf05291e am: 217e152229 
am: dffb037bb8  -s ours

* commit 'dffb037bb8565a0e2972074c2d74cc62290f31a3':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: I11fb020874c8fcdcb2b7e9f67981e86e9c434a34
 2016-06-06 20:26:13 +00:00
Stuart Scott
027e2d204e Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev 
am: 56760c65df

* commit '56760c65df6ca55d4570847b9f9777a23e2dfaf5':
  Add carrier config key for carrier setup app.

Change-Id: Ie6ab4cd355c061a7c6f04228fefde2ebf690eb59
 2016-06-06 20:17:20 +00:00
TreeHugger Robot
56760c65df Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev 2016-06-06 20:11:52 +00:00
Android Build Merger (Role)
265787fded Merge "Merge "TIF: Set the surface secure" into nyc-dev am: 9675f16bba am: 6cb63622e3" into nyc-mr1-dev-plus-aosp 2016-06-06 20:04:33 +00:00
Jae Seo
cf0016e114 Merge "TIF: Set the surface secure" into nyc-dev am: 9675f16bba 
am: 6cb63622e3

* commit '6cb63622e331affd8500a93a9a9660fde1725611':
  TIF: Set the surface secure

Change-Id: I90345d31b53c35f0144c60d70b0f9244a90f0eba
 2016-06-06 20:04:06 +00:00
Jae Seo
9aa6e93aba Merge "TIF: Set the surface secure" into nyc-dev am: 9675f16bba 
am: 711ae66a4b

* commit '711ae66a4b067fd6740561b8bd4fd228dd4fb98e':
  TIF: Set the surface secure

Change-Id: Ib06c3a94ec180f4856791ed13e1d76c96dde64fc
 2016-06-06 20:04:03 +00:00
smain@google.com
e22fa7266a add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe am: 78483fdc3d am: 894e7b6f78 
am: 345d292e9a

* commit '345d292e9a0cd8f27d95f0a78d53d0fffec40b22':

Change-Id: I93e18276a3f37169b15309de003c36f5fe7af5d5
 2016-06-06 20:01:26 +00:00
Jae Seo
711ae66a4b Merge "TIF: Set the surface secure" into nyc-dev 
am: 9675f16bba

* commit '9675f16bba6837840038aea92e9db5893cecd33e':
  TIF: Set the surface secure

Change-Id: Ic70459cd294453907ce573c55ca0f16868177789
 2016-06-06 20:01:14 +00:00
smain@google.com
d2396d3505 add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe am: 78483fdc3d am: 894e7b6f78 
am: 8730f3a1d1

* commit '8730f3a1d1e0d22bf85403424f9fcccc84a594cc':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: I995f460306695d07ea34dce1c32865fd6a688e0b
 2016-06-06 19:58:32 +00:00
Jae Seo
6cb63622e3 Merge "TIF: Set the surface secure" into nyc-dev 
am: 9675f16bba

* commit '9675f16bba6837840038aea92e9db5893cecd33e':
  TIF: Set the surface secure

Change-Id: Iae2496a4b761b7635c49272b0611bec7db4b9040
 2016-06-06 19:58:30 +00:00
smain@google.com
345d292e9a add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe am: 78483fdc3d 
am: 894e7b6f78

* commit '894e7b6f78cf9f336242d3b75c99a448e232f4da':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: I70c01a28d69d2300b59df49e6bd1efe59819f3d7
 2016-06-06 19:55:48 +00:00
smain@google.com
8730f3a1d1 add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe am: 78483fdc3d 
am: 894e7b6f78

* commit '894e7b6f78cf9f336242d3b75c99a448e232f4da':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: I0b1956c103ff0f6a843891c415b179103220e6e2
 2016-06-06 19:55:40 +00:00
Jae Seo
9675f16bba Merge "TIF: Set the surface secure" into nyc-dev 2016-06-06 19:55:29 +00:00
smain@google.com
894e7b6f78 add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe 
am: 78483fdc3d

* commit '78483fdc3d624401f32f9574d1800a6ccbf09428':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: Ia027c9e91353b781f0a8334527bed4e6528e7c35
 2016-06-06 19:51:08 +00:00
smain@google.com
78483fdc3d add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 
am: 7573c42dbe

* commit '7573c42dbed65334ef3d86a06dd861a01f6d0ed4':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: I8c81af0e1aab745ed10dbc8916edd22e7d3dd1a9
 2016-06-06 19:45:55 +00:00
smain@google.com
7573c42dbe add redirect for removed dupe logcat page 
per: https://critique.corp.google.com/#review/122118806
bug: 29122576

Change-Id: Icf4f559bb7d246d4f340c15a55580e9248806cee
 2016-06-06 12:40:51 -07:00
Android Build Merger (Role)
08b717f4d6 Merge "Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev am: 90eece4a77 am: 8a95c3d6d3" into nyc-mr1-dev-plus-aosp 2016-06-06 19:39:08 +00:00
Adarsh Fernando
ca2c5de149 Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev am: 90eece4a77 
am: 20df38dda9

* commit '20df38dda9791c80dfb3f30808df58e49f97ba58':
  DOCS: Updated Java 8 language support list with Type Annotations.

Change-Id: Ifb50027ab9159c8a186ffc6bcf470f999b098415
 2016-06-06 19:38:44 +00:00
Adarsh Fernando
3b129afc27 Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev am: 90eece4a77 
am: 8a95c3d6d3

* commit '8a95c3d6d38901ee030b0015e8d456cb74777487':
  DOCS: Updated Java 8 language support list with Type Annotations.

Change-Id: I7ec1cc20a79a1c17267d71185f28e1367cff14cc
 2016-06-06 19:38:43 +00:00
Adarsh Fernando
20df38dda9 Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev 
am: 90eece4a77

* commit '90eece4a7765c6574c9e5b21b258bff69e32fa4b':
  DOCS: Updated Java 8 language support list with Type Annotations.

Change-Id: Ic27ef8a9625cd0d6cc2d892b170df8f744c840b0
 2016-06-06 19:35:47 +00:00
Adarsh Fernando
8a95c3d6d3 Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev 
am: 90eece4a77

* commit '90eece4a7765c6574c9e5b21b258bff69e32fa4b':
  DOCS: Updated Java 8 language support list with Type Annotations.

Change-Id: If4927acde9ecabc934306c8ab001ed7eec4795d5
 2016-06-06 19:35:45 +00:00
Android Build Merger (Role)
e5c466b730 Merge "Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev am: 56cf05291e am: 28a6a3f435" into nyc-mr1-dev-plus-aosp 2016-06-06 19:32:29 +00:00
Guang Zhu
642f7ff706 Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev am: 56cf05291e 
am: 28a6a3f435

* commit '28a6a3f435d89b47bd94c8bf635180a9c1c9f306':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: Ie79a36058d87482f54c6401d41ca83756b8346b8
 2016-06-06 19:32:05 +00:00
Guang Zhu
dffb037bb8 Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev am: 56cf05291e 
am: 217e152229

* commit '217e152229c51a6d535e6b739ab48c4091d6cd0e':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: I9b28c0c844c1d8a88e9869c9a525c32500ebc05b
 2016-06-06 19:31:31 +00:00
Adarsh Fernando
90eece4a77 Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev 2016-06-06 19:30:53 +00:00
Guang Zhu
28a6a3f435 Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev 
am: 56cf05291e

* commit '56cf05291e1ffb54025a47ccb046f44c2d05ef14':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: Ibc04084e8123a0e0bfe9cbe1c34a1a767dde03ab
 2016-06-06 19:27:54 +00:00
Guang Zhu
217e152229 Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev 
am: 56cf05291e

* commit '56cf05291e1ffb54025a47ccb046f44c2d05ef14':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: If5e573f0fdb7d9ff8e70f4172fb0adf38c2b552a
 2016-06-06 19:27:52 +00:00
Guang Zhu
56cf05291e Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev 2016-06-06 19:22:32 +00:00
Ben Lin
92b6768eaa Merge "Merge "Adding docsui prefix to access metric tags." into nyc-dev am: de862e1cc8 am: 74190e4a38" into nyc-mr1-dev-plus-aosp 
am: bc7b5c13f2

* commit 'bc7b5c13f25657a92372a749047c60bacb68a582':

Change-Id: I2422b6b7dc75f1645e0b467eb1f7347aefc4c647
 2016-06-06 18:21:41 +00:00
Ben Lin
36c5e5de26 Merge "Adding docsui prefix to access metric tags." into nyc-dev am: de862e1cc8 am: 8454626813 
am: f5099d7c16

* commit 'f5099d7c163133ecd415a222cca7f3469378169d':
  Adding docsui prefix to access metric tags.

Change-Id: I4722276266d4a53fbc5a61cbbe05a9613dd0a3b8
 2016-06-06 18:17:57 +00:00
Android Build Merger (Role)
bc7b5c13f2 Merge "Merge "Adding docsui prefix to access metric tags." into nyc-dev am: de862e1cc8 am: 74190e4a38" into nyc-mr1-dev-plus-aosp 2016-06-06 18:15:14 +00:00
Ben Lin
1dd6d7d63d Merge "Adding docsui prefix to access metric tags." into nyc-dev am: de862e1cc8 
am: 74190e4a38

* commit '74190e4a381d252ae868500b64cdcd67aa51ce64':
  Adding docsui prefix to access metric tags.

Change-Id: Ia6c178233b9b6fadc7f652b63f6df551285e6777
 2016-06-06 18:14:41 +00:00
Ben Lin
f5099d7c16 Merge "Adding docsui prefix to access metric tags." into nyc-dev am: de862e1cc8 
am: 8454626813

* commit '84546268130f2d59d2844c14fb078db36bc61ceb':
  Adding docsui prefix to access metric tags.

Change-Id: I6b1ee9d80c19a475f7b1156f092e72d11bc2c68c
 2016-06-06 18:13:39 +00:00
Ben Lin
74190e4a38 Merge "Adding docsui prefix to access metric tags." into nyc-dev 
am: de862e1cc8

* commit 'de862e1cc82d96d22394201cb8867b643e4f2e93':
  Adding docsui prefix to access metric tags.

Change-Id: I74cae4f5a7b89411b0e7ebcee348ee05c1cc15f2
 2016-06-06 18:08:20 +00:00
Ben Lin
8454626813 Merge "Adding docsui prefix to access metric tags." into nyc-dev 
am: de862e1cc8

* commit 'de862e1cc82d96d22394201cb8867b643e4f2e93':
  Adding docsui prefix to access metric tags.

Change-Id: Id3dc690e4f753af51acb406565c643d2fdc01ec1
 2016-06-06 18:08:07 +00:00
Ben Lin
de862e1cc8 Merge "Adding docsui prefix to access metric tags." into nyc-dev 2016-06-06 18:04:12 +00:00
Stuart Scott
9abc2735fa Add carrier config key for carrier setup app. 
bug:28374700
bug:28374253
Change-Id: Icf56d4d2a89e32a062f3b8cc624f17e06c994599
 2016-06-06 10:42:18 -07:00
Todd Kennedy
6a33607cea Merge "Merge "New non-priv prebuilt" into nyc-dev am: 262ff10eb2 am: f1e788dfce" into nyc-mr1-dev-plus-aosp 
am: 7e64155358

* commit '7e64155358de80204ad647fd7ff1eda06ce1ee36':

Change-Id: I1e3bb7537986f56b9208cefb0066dc76bbe067f0
 2016-06-06 16:57:08 +00:00
Todd Kennedy
5a7984c582 Merge "New non-priv prebuilt" into nyc-dev am: 262ff10eb2 am: 52821051d2 
am: c6ed31f316

* commit 'c6ed31f3167b31c0ac5d2d138419ebf3b87ab252':
  New non-priv prebuilt

Change-Id: Ia87684b9666f2cc6d4faa66c69602f0529f44404
 2016-06-06 16:57:06 +00:00
Android Build Merger (Role)
7e64155358 Merge "Merge "New non-priv prebuilt" into nyc-dev am: 262ff10eb2 am: f1e788dfce" into nyc-mr1-dev-plus-aosp 2016-06-06 16:53:25 +00:00
Todd Kennedy
d94e61f04d Merge "New non-priv prebuilt" into nyc-dev am: 262ff10eb2 
am: f1e788dfce

* commit 'f1e788dfce59cc958a9dbe6416e849ff00e19508':
  New non-priv prebuilt

Change-Id: If5c9ce48fc1364f56266332f446288b4c1e28e2c
 2016-06-06 16:52:01 +00:00
Todd Kennedy
c6ed31f316 Merge "New non-priv prebuilt" into nyc-dev am: 262ff10eb2 
am: 52821051d2

* commit '52821051d2b71b72db6fa74e2178284f89495ff1':
  New non-priv prebuilt

Change-Id: Id13ec2393c633d8d6e9ce1038e602102b301abd3
 2016-06-06 16:51:58 +00:00