Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
258,341 Commits 3 Branches 0 Tags
661cd803aff4a42e19893516d053775a41497233
Commit Graph

258341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
661cd803af Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa -s ours 
am: 0118fbd3ef  -s ours

* commit '0118fbd3ef557461ab4725a06eb9064d622cf88f':
  Import translations. DO NOT MERGE

Change-Id: Icf798098101b876a050d56dedfb417e27b742971
 2016-06-07 03:25:44 +00:00
Andreas Gampe
6b64b15307 Frameworks/base: Update compiled-classes-phone am: e16dc04bd8 
am: ae702d305f

* commit 'ae702d305ff44a0e4ec59d3a9c5fb153e77587eb':
  Frameworks/base: Update compiled-classes-phone

Change-Id: I10469b84f9f291d931562f7b71be39bc232a86f9
 2016-06-07 03:25:41 +00:00
Andreas Gampe
27ece5e7ee Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am: ba94385e5f 
am: 270657c8e7

* commit '270657c8e7d429a7f296c8d2789e7b16ff7ffdd8':

Change-Id: Ica8a7d1eddf7b2b0529160e9af9a39f21f744f8b
 2016-06-07 03:25:36 +00:00
Bill Yi
0118fbd3ef Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2b92ce7aaa  -s ours

* commit '2b92ce7aaa5a0f22a742cd688488c8b8b05ce82b':
  Import translations. DO NOT MERGE

Change-Id: Iec4e17778428bdda04d9ea34010abbdfcfede9c5
 2016-06-07 03:21:09 +00:00
Andreas Gampe
ae702d305f Frameworks/base: Update compiled-classes-phone 
am: e16dc04bd8

* commit 'e16dc04bd82464a289eb00f807293c1da33c179c':
  Frameworks/base: Update compiled-classes-phone

Change-Id: I6a02ffbf03e5dc22b21c54cc24268f4e6b54459c
 2016-06-07 03:21:06 +00:00
Andreas Gampe
609168a3d9 Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am: ba94385e5f 
am: 572b0daf85

* commit '572b0daf851126aceefdd3496d41e4352f13898c':
  Frameworks/base: Update preloaded-classes

Change-Id: Id211354ff06f7cd70fdcbb363c0573d004947cfc
 2016-06-07 03:21:05 +00:00
Bill Yi
45f3daff68 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 4ce8e19231  -s ours

* commit '4ce8e1923168f0ccbd0e7c5acd159c827d55f101':
  Import translations. DO NOT MERGE

Change-Id: Ibc743845940e3d6f43b6d54f2d991fe8fa2d2a94
 2016-06-07 03:18:19 +00:00
Andreas Gampe
572b0daf85 Merge "Frameworks/base: Update preloaded-classes" into nyc-dev 
am: ba94385e5f

* commit 'ba94385e5f8af1556755a7fa5c8e9c3bcb3e5fb0':
  Frameworks/base: Update preloaded-classes

Change-Id: I2c918b2207331cad8d2904f4f314cf9490c4ccac
 2016-06-07 03:17:06 +00:00
Andreas Gampe
270657c8e7 Merge "Frameworks/base: Update preloaded-classes" into nyc-dev 
am: ba94385e5f

* commit 'ba94385e5f8af1556755a7fa5c8e9c3bcb3e5fb0':
  Frameworks/base: Update preloaded-classes

Change-Id: Iaf5270f03ef6214b9d3064f19aa0219b422687c5
 2016-06-07 03:17:03 +00:00
TreeHugger Robot
2b92ce7aaa Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-07 03:13:22 +00:00
TreeHugger Robot
4ce8e19231 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-07 03:12:33 +00:00
Andreas Gampe
e16dc04bd8 Frameworks/base: Update compiled-classes-phone 
Another update.

Bug: 27248115
Change-Id: Ia208b37e9b9b649215ad1024ba0438627bc89f8a
 2016-06-07 03:12:03 +00:00
TreeHugger Robot
ba94385e5f Merge "Frameworks/base: Update preloaded-classes" into nyc-dev 2016-06-07 03:09:55 +00:00
Bill Yi
7ca38bd8e7 Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours 
am: 90c64f02f2  -s ours

* commit '90c64f02f20db0b918c3b9c26d76a8dce3e4e576':

Change-Id: I9e305546e7aac8e3f40814633b2450ce3897b713
 2016-06-07 02:40:50 +00:00
Bill Yi
b9e8801f85 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours 
am: e4872d1849  -s ours

* commit 'e4872d1849a265e577b9ef66fd0658da897fecce':

Change-Id: I9e555f56da7dcd1ce04406fc80d8716ad4e4cc36
 2016-06-07 02:40:46 +00:00
Android Build Merger (Role)
3658e10468 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours am: b3d3104969 -s ours" into nyc-mr1-dev-plus-aosp 2016-06-07 02:34:06 +00:00
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
35243a1f6a Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146 -s ours 
am: b3d3104969  -s ours

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

Change-Id: I7ffcfce55ed4c38bf82802a7724f8952b5f1bb60
 2016-06-07 02:33:16 +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
b3d3104969 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f3d2c06146  -s ours

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

Change-Id: I45a645fa1affcb646938ae71710634a87008464c
 2016-06-07 02:27:55 +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
90c64f02f2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f3d2c06146  -s ours

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

Change-Id: Ie6bc9da984bc94b51d091bf3a3b4c035ff83aba6
 2016-06-07 02:27:37 +00:00
Bill Yi
e4872d1849 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 93e807485e  -s ours

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

Change-Id: Ic44082939456434a33682a1f5c2cee4a0f4b3d9d
 2016-06-07 02:27:32 +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
f3d2c06146 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-07 02:22:01 +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
Bill Yi
ac8ac265df Import translations. DO NOT MERGE 
Change-Id: I27585cc106f05b6718346375dc8231fc59409dfd
Auto-generated-cl: translation import
 2016-06-06 18:43:36 -07:00
Bill Yi
f0807602e7 Import translations. DO NOT MERGE 
Change-Id: I439834e3adbbd35aa0094caaf66776cf03e84276
Auto-generated-cl: translation import
 2016-06-06 18:38:01 -07: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
5ff0bd5c92 Import translations. DO NOT MERGE 
Change-Id: I53a52ba5b590a502a7e2dcdef540cd2e4baaffbe
Auto-generated-cl: translation import
 2016-06-06 16:00:06 -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 04073dc5be.

Bug: 29128683
Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9
 2016-06-06 22:04:54 +00:00
Andreas Gampe
cbcb9e3ec6 Frameworks/base: Update preloaded-classes 
Another update.

Bug: 27248115
Change-Id: Ie0c3b8624a0f43c400a71759c176c02c56d270af
 2016-06-06 14:58:44 -07: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