drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
258,316 Commits 1 Branch 0 Tags
Commit Graph

258316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
0a23f89159 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours am: a2a976498e -s ours" into nyc-mr1-dev-plus-aosp 2016-06-07 02:33:46 +00:00
Bill Yi
734457c729 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours 
am: a2a976498e  -s ours

* commit 'a2a976498e5a70afc6c525fce58f48ecf5c9c19f':
  Import translations. DO NOT MERGE

Change-Id: Idc8712fa15780446aa9d2c035b6c1eefea49b449
 2016-06-07 02:33:14 +00:00
Bill Yi
672cab5856 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: c52adeb73f  -s ours

* commit 'c52adeb73f1dc992fd9771b9c80f5209dd0f7a64':
  Import translations. DO NOT MERGE

Change-Id: Iec2abf34165c65d077037928387150688f64420d
 2016-06-07 02:31:59 +00:00
Bill Yi
a2a976498e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 93e807485e  -s ours

* commit '93e807485edc5de8b549b7d5a5ce7e52f5315094':
  Import translations. DO NOT MERGE

Change-Id: Ib8d00f5d63a48aa529393edc29c226c11824c476
 2016-06-07 02:27:48 +00:00
Bill Yi
02914bc95b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: ffe7746437  -s ours

* commit 'ffe7746437e8f06cc7dd2571c3354973791c8a8a':
  Import translations. DO NOT MERGE

Change-Id: I7716f7ee468653bf3dce0d739f611d572d4ba916
 2016-06-07 02:24:50 +00:00
TreeHugger Robot
c52adeb73f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-07 02:22:18 +00:00
TreeHugger Robot
93e807485e Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-07 02:21:45 +00:00
TreeHugger Robot
ffe7746437 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-07 02:21:06 +00:00
Eino-Ville Talvala
abb7488998 Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 
am: fe3ecdab1b

* commit 'fe3ecdab1b461d811825ce363d7041f3c8c120c3':
  Revert "Internal API for cross-task Activity used by assistant."

Change-Id: If16a43f4a17e71cc12ed7c912ed5e6a46c85e56c
 2016-06-06 23:50:36 +00:00
TreeHugger Robot
fe3ecdab1b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 2016-06-06 23:44:34 +00:00
Bill Yi
47f986f6c4 Import translations. DO NOT MERGE 
Change-Id: Ie4d854df968366efde752e7ebe89afbe5aa8183a
Auto-generated-cl: translation import
 2016-06-06 16:10:00 -07:00
Bill Yi
2b92bcbdf2 Import translations. DO NOT MERGE 
Change-Id: I435f426fc53cd54df412c159c7016eb5cfe934a7
Auto-generated-cl: translation import
 2016-06-06 15:47:45 -07:00
Bill Yi
f6620acbe0 Import translations. DO NOT MERGE 
Change-Id: Ia47328b8bfe256eb0fe17b869b8bbcce19ff2cd2
Auto-generated-cl: translation import
 2016-06-06 15:28:06 -07:00
Android Build Merger (Role)
a1e9b08808 Merge "docs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8 am: 91131f459c am: 3c50c030e6" into nyc-mr1-dev-plus-aosp 2016-06-06 22:21:48 +00:00
Joe Fernandez
0ac0fbc265 docs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8 am: 91131f459c 
am: ecc2b7ac26

* commit 'ecc2b7ac26a254d5d3da910dab3cb07ae1cae21d':
  docs: Update Android Dashboard for June 2016

Change-Id: I0034543c36bf5b6264636da77151169638a21159
 2016-06-06 22:21:19 +00:00
Joe Fernandez
f497bec13b docs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8 am: 91131f459c 
am: 3c50c030e6

* commit '3c50c030e69c2f14fcb7acccfa981bda3eb77460':
  docs: Update Android Dashboard for June 2016

Change-Id: Ie186ec772769b12dab2ed8372b027787c817faf2
 2016-06-06 22:21:16 +00:00
Joe Fernandez
3c50c030e6 docs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8 
am: 91131f459c

* commit '91131f459c490d735ccc57392c6e4ccac667826e':
  docs: Update Android Dashboard for June 2016

Change-Id: Ic79c27b483f664d6d365bbfa1c912c12a8f6c2d0
 2016-06-06 22:18:19 +00:00
Joe Fernandez
ecc2b7ac26 docs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8 
am: 91131f459c

* commit '91131f459c490d735ccc57392c6e4ccac667826e':
  docs: Update Android Dashboard for June 2016

Change-Id: I12062a187d6aa0bfd0d005b7fe22c190b7a06f56
 2016-06-06 22:18:17 +00:00
Joe Fernandez
91131f459c docs: Update Android Dashboard for June 2016 am: ab59c24004 
am: b3ad0e05a8

* commit 'b3ad0e05a82cb53678a0fdbbcd45ed09b0cfdeed':
  docs: Update Android Dashboard for June 2016

Change-Id: I81e5cf24ecb6616ac4d6f89a160dfba0c5fba7a0
 2016-06-06 22:13:10 +00:00
Joe Fernandez
b3ad0e05a8 docs: Update Android Dashboard for June 2016 
am: ab59c24004

* commit 'ab59c240040448a51b3cb3b3cd8ec97e96cf6d80':
  docs: Update Android Dashboard for June 2016

Change-Id: If7daf8d73b8653b02f6f3f682c136947f25bec80
 2016-06-06 22:08:01 +00:00
Eino-Ville Talvala
563df3b328 Revert "Internal API for cross-task Activity used by assistant." 
This reverts commit 04073dc5be4c8faad41f549617ed1c3ef999d6b2.

Bug: 29128683
Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9
 2016-06-06 22:04:54 +00:00
Joe Fernandez
ab59c24004 docs: Update Android Dashboard for June 2016 
Change-Id: Iec84a33d5bc456e5feaf7dcee0880035c9b7c559
 2016-06-06 14:56:23 -07: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
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