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

266867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
360724ecda Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours am: a2a976498e -s ours" into nyc-mr1-dev-plus-aosp 
am: 0a23f89159  -s ours

* commit '0a23f89159bea400d1ed5300056d207d6ff3e783':
  Import translations. DO NOT MERGE

Change-Id: Ib8c76c34661b3c40e2230f9390bffd696e1973df
 2016-06-07 02:41:23 +00:00
TreeHugger Robot
d151165e13 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:37:34 +00:00
Bill Yi
c30086a8e2 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c52adeb73f -s ours 
am: 672cab5856  -s ours

* commit '672cab58568d2cd1e710205a2e746a9eed9dea91':
  Import translations. DO NOT MERGE

Change-Id: I512619eb93c1a8238df4de7d426cafde93ec81f8
 2016-06-07 02:36:50 +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
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
b37799dc36 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ffe7746437 -s ours 
am: 02914bc95b  -s ours

* commit '02914bc95badcda08e8f0f46fa80b5ae5bc75f49':
  Import translations. DO NOT MERGE

Change-Id: Ia03a3fbd0937327715e12911ce71c613eeabbb8e
 2016-06-07 02:31:05 +00:00
TreeHugger Robot
23c2ec20b7 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:29:02 +00:00
TreeHugger Robot
3c006b4936 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:28:43 +00:00
TreeHugger Robot
cd17b663c3 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:28:25 +00:00
TreeHugger Robot
6b94dfcb61 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:28:04 +00:00
TreeHugger Robot
cbfd66566c Merge "Import translations. DO NOT MERGE" 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
TreeHugger Robot
3412730a17 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:27:22 +00:00
TreeHugger Robot
0110588254 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:26:45 +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
Bill Yi
cdfaf7b6d2 Import translations. DO NOT MERGE 
Change-Id: If73020cacc0770fe6f48ae15c4d23f1e0862d2b6
Auto-generated-cl: translation import
 2016-06-06 17:43:01 -07:00
Eino-Ville Talvala
d9a7b1e07b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev am: fe3ecdab1b 
am: abb7488998

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

Change-Id: Id397afe9221e2562e096befc1b105233618ca7ef
 2016-06-06 23:55:58 +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
Joe Fernandez
9b75a6c266 Merge "docs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8 am: 91131f459c am: 3c50c030e6" into nyc-mr1-dev-plus-aosp 
am: a1e9b08808

* commit 'a1e9b088080d253a533b51a12006e6d33cfaf3a0':

Change-Id: I1022a13791b5c71b3df56f7be5b3e28ac994d097
 2016-06-06 22:31:08 +00: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
Joe Fernandez
76bb0156b6 docs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8 am: 91131f459c am: ecc2b7ac26 
am: 0ac0fbc265

* commit '0ac0fbc265d6b1bcfbe9150d17cd52dfd8e0a30e':
  docs: Update Android Dashboard for June 2016

Change-Id: I92fbd1450a78674bc1db8c7d3b5fbbe916669833
 2016-06-06 22:25:50 +00: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
Joe Fernandez
ab59c24004 docs: Update Android Dashboard for June 2016 
Change-Id: Iec84a33d5bc456e5feaf7dcee0880035c9b7c559
 2016-06-06 14:56:23 -07:00
Bill Yi
931864e843 Import translations. DO NOT MERGE 
Change-Id: I1ba33a09c3fa53bc5b22e73622e658790a3ce9fd
Auto-generated-cl: translation import
 2016-06-06 14:29:11 -07:00
Bill Yi
a7a9300171 Import translations. DO NOT MERGE 
Change-Id: I18c81bced6c4a826bf34c0b420ff2b8047841796
Auto-generated-cl: translation import
 2016-06-06 14:04:50 -07:00
Bill Yi
d90beb9aa6 Import translations. DO NOT MERGE 
Change-Id: Ibd1d6e05c351847cdda31da95c9fbede67861860
Auto-generated-cl: translation import
 2016-06-06 14:02:19 -07:00
TreeHugger Robot
40ebd9f511 Merge "Suppress auto-closing drawer and add ripple effect on spring load roots." 2016-06-06 20:59:34 +00:00
Bill Yi
bd27b1ad52 Import translations. DO NOT MERGE 
Change-Id: I21d05ea37d15e191cb372eae3dfc4fdda669e70c
Auto-generated-cl: translation import
 2016-06-06 13:55:54 -07:00
Bill Yi
cf3f08d4e8 Import translations. DO NOT MERGE 
Change-Id: I98171b651d3e690b0439bb2d205ca615d191c7bd
Auto-generated-cl: translation import
 2016-06-06 13:49:28 -07:00
Bill Yi
a24405580e Import translations. DO NOT MERGE 
Change-Id: I1d0bbbb4545061f4f4d07cc69a61ce4269c1bf86
Auto-generated-cl: translation import
 2016-06-06 13:42:30 -07:00
Bill Yi
16b6a5d9bd Import translations. DO NOT MERGE 
Change-Id: I5a5b4ba97a9d614542391d6af2e48b8edf8c0698
Auto-generated-cl: translation import
 2016-06-06 13:37:26 -07:00
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