Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,756 Commits 3 Branches 0 Tags
ca16cb9d001afbc00a23253a32afffb983d97b07
Commit Graph

251756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
ca16cb9d00 Merge "Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev am: 3e04c56432 am: a7ebe2c7da" into nyc-mr1-dev-plus-aosp 2016-05-09 23:37:20 +00:00
Selim Cinek
71ffe87a09 Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev am: 3e04c56432 
am: a7ebe2c7da

* commit 'a7ebe2c7daa376963f0011859be2eaff8dc7614a':

Change-Id: Ie9331fc2ca74045031625afe3016cc0b449acbd3
 2016-05-09 23:36:58 +00:00
Android Build Merger (Role)
b5cf8bce4a Merge "Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev am: 3e04c56432 am: a7ebe2c7da" into nyc-mr1-dev-plus-aosp 2016-05-09 23:35:11 +00:00
Selim Cinek
dec87b92e2 Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev am: 3e04c56432 
am: a7ebe2c7da

* commit 'a7ebe2c7daa376963f0011859be2eaff8dc7614a':
  Fixed a crash with min-priority notifications in a group

Change-Id: I242a9b7c2da6e144eede19276f1f71c894d433dc
 2016-05-09 23:34:43 +00:00
Selim Cinek
64c403ef8b Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev am: 3e04c56432 
am: 9b4680d6aa

* commit '9b4680d6aa309180e60b58660418ce245d124627':
  Fixed a crash with min-priority notifications in a group

Change-Id: I0436194e8e1ad09221be3f60d12365ce065f06cc
 2016-05-09 23:34:41 +00:00
Selim Cinek
9b4680d6aa Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev 
am: 3e04c56432

* commit '3e04c5643230cb9ac688f1367e19495509005637':
  Fixed a crash with min-priority notifications in a group

Change-Id: Ied5a5dda2babecea1392dc2f065810cfe060ed8c
 2016-05-09 23:29:15 +00:00
Selim Cinek
a7ebe2c7da Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev 
am: 3e04c56432

* commit '3e04c5643230cb9ac688f1367e19495509005637':
  Fixed a crash with min-priority notifications in a group

Change-Id: I3167891563ba73c895ca41ed0cfead37c6601110
 2016-05-09 23:29:12 +00:00
Selim Cinek
3e04c56432 Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev 2016-05-09 23:19:28 +00:00
Android Build Merger (Role)
c1ec9abef4 Merge "Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev am: 3b25fd081d am: 0ee1a7e838" into nyc-mr1-dev-plus-aosp 2016-05-09 22:25:33 +00:00
Joe Onorato
b5647eb637 Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev am: 3b25fd081d 
am: 0ee1a7e838

* commit '0ee1a7e838708aaba29db13dbc1642a0d70107d2':

Change-Id: Ifc1605ecda76c3ad3bdc5f7ef9b71a886bed71d6
 2016-05-09 22:25:08 +00:00
Android Build Merger (Role)
59f171c9b1 Merge "Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev am: 3b25fd081d am: 0ee1a7e838" into nyc-mr1-dev-plus-aosp 2016-05-09 22:23:06 +00:00
Joe Onorato
156dd1207d Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev am: 3b25fd081d 
am: 0ee1a7e838

* commit '0ee1a7e838708aaba29db13dbc1642a0d70107d2':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: Ib34ae2cfe6caecc858f06f94d3db30e8fa31321a
 2016-05-09 22:22:43 +00:00
Joe Onorato
64b2e26c4e Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev am: 3b25fd081d 
am: bdff78d9ea

* commit 'bdff78d9eadf2e9c0f8333aa457ffeac3b947fa8':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: If90e8eb85bfd85e3f46c04de34f4d1f4db177673
 2016-05-09 22:22:40 +00:00
Joe Onorato
bdff78d9ea Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev 
am: 3b25fd081d

* commit '3b25fd081d6af21b16ab4b96ead70766b3d78d06':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: Iec6ad93e7445df5d642aba24867c264c435c53ba
 2016-05-09 22:17:10 +00:00
Joe Onorato
0ee1a7e838 Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev 
am: 3b25fd081d

* commit '3b25fd081d6af21b16ab4b96ead70766b3d78d06':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: I27ccd973ff6a14387a11f19c30dcb5a3ae95b802
 2016-05-09 22:17:08 +00:00
Yi Kong
9067a0965b Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4 
am: e508826d72

* commit 'e508826d7204249d204b0b17004d85bb32b124cf':
  Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4

Change-Id: I0b69ef351d3b80178788ce2b8d456cf063f03786
 2016-05-09 22:17:06 +00:00
Yi Kong
e508826d72 Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4 
Fix build.

Bug: 28582540
Change-Id: Ic944995957aa1a5ec65ecab2a8d4b8587094ccc8
(cherry picked from commit c2b4f49241)
(cherry picked from commit 3657e7985a)
 2016-05-09 22:04:45 +00:00
TreeHugger Robot
3b25fd081d Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev 2016-05-09 22:03:05 +00:00
Android Build Merger (Role)
2919513e43 Merge "Merge "Fixing regression in call to showRecents()." into nyc-dev am: e981777f0e am: 7afa31af13" into nyc-mr1-dev-plus-aosp 2016-05-09 22:00:18 +00:00
Android Build Merger (Role)
c7a38de0a7 Merge "Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a4a am: 017d8647ab" into nyc-mr1-dev-plus-aosp 2016-05-09 22:00:05 +00:00
Winson Chung
57f70db054 Merge "Fixing regression in call to showRecents()." into nyc-dev am: e981777f0e 
am: 7afa31af13

* commit '7afa31af131da7784766f23d21f6a4310367a90e':

Change-Id: I982d2bcfc8684f7bf6e88916bb8c7f99ed37b7b4
 2016-05-09 21:59:31 +00:00
Paul Crowley
73b5c5a135 Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a4a 
am: 017d8647ab

* commit '017d8647ab225089361219fae3ac7e86204b9736':

Change-Id: I5e4197e06f8140b9cf1a8d1f2fbe399891b3e2b2
 2016-05-09 21:59:23 +00:00
Android Build Merger (Role)
c49340d649 Merge "Merge "Fixing regression in call to showRecents()." into nyc-dev am: e981777f0e am: 7afa31af13" into nyc-mr1-dev-plus-aosp 2016-05-09 21:56:21 +00:00
Android Build Merger (Role)
27f296b304 Merge "Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a4a am: 017d8647ab" into nyc-mr1-dev-plus-aosp 2016-05-09 21:56:11 +00:00
Winson Chung
63e4830510 Merge "Fixing regression in call to showRecents()." into nyc-dev am: e981777f0e 
am: 7afa31af13

* commit '7afa31af131da7784766f23d21f6a4310367a90e':
  Fixing regression in call to showRecents().

Change-Id: I09c0513140f741727a9c42bf4831108087f34ef2
 2016-05-09 21:55:45 +00:00
Paul Crowley
720691376c Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a4a 
am: 017d8647ab

* commit '017d8647ab225089361219fae3ac7e86204b9736':
  Two phases to set the password for disk encryption

Change-Id: I22c2afb0ac7cbfdd003aa8db2e25cbf21da04c45
 2016-05-09 21:55:40 +00:00
Winson Chung
76c72cdc89 Merge "Fixing regression in call to showRecents()." into nyc-dev am: e981777f0e 
am: 3da6a8d8a3

* commit '3da6a8d8a3faeb08cf0f3f5684295492d2dec8ec':
  Fixing regression in call to showRecents().

Change-Id: Id3ddd9809ca5a3bc8df84b34d8356acf2c9d6ac9
 2016-05-09 21:55:28 +00:00
Paul Crowley
5f0856afc3 Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a4a 
am: d365ddbd73

* commit 'd365ddbd736729415df5a9b5823e74ad87ac2380':
  Two phases to set the password for disk encryption

Change-Id: I11a856a217d8313925385e2b053afe2356a4646e
 2016-05-09 21:55:25 +00:00
Winson
3da6a8d8a3 Merge "Fixing regression in call to showRecents()." into nyc-dev 
am: e981777f0e

* commit 'e981777f0e92f7e35d283a41c98f4d99e561c679':
  Fixing regression in call to showRecents().

Change-Id: Ic1b762945828aaaa99cfa96a5b86132e671bc025
 2016-05-09 21:50:23 +00:00
Paul Crowley
d365ddbd73 Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 9aa6bb5a4a

* commit '9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4':
  Two phases to set the password for disk encryption

Change-Id: Ic8102ebd218f387236aa5ef013ccdf4bc8f58ce1
 2016-05-09 21:50:20 +00:00
Winson
7afa31af13 Merge "Fixing regression in call to showRecents()." into nyc-dev 
am: e981777f0e

* commit 'e981777f0e92f7e35d283a41c98f4d99e561c679':
  Fixing regression in call to showRecents().

Change-Id: I8379d5f50fd30cf80e973109c8c3f9cb36bb0cc2
 2016-05-09 21:49:56 +00:00
Paul Crowley
017d8647ab Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 9aa6bb5a4a

* commit '9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4':
  Two phases to set the password for disk encryption

Change-Id: Ic77d5608961b34993848fc71809a27001d919abc
 2016-05-09 21:49:54 +00:00
Winson Chung
e981777f0e Merge "Fixing regression in call to showRecents()." into nyc-dev 2016-05-09 21:36:57 +00:00
Android Build Merger (Role)
b3510f5320 Merge "Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev am: a806e8ab12 am: 87704f6861" into nyc-mr1-dev-plus-aosp 2016-05-09 21:36:05 +00:00
Chong Zhang
db19f319fc Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev am: a806e8ab12 
am: 87704f6861

* commit '87704f68614eefb5f475baa7831785eadf6aacd1':

Change-Id: I7d705ed4d05c6ca421373338edf63b8f9ee3fac6
 2016-05-09 21:35:42 +00:00
Paul Crowley
9aa6bb5a4a Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-09 21:35:34 +00:00
Android Build Merger (Role)
c6b3b7b680 Merge "Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev am: a806e8ab12 am: 87704f6861" into nyc-mr1-dev-plus-aosp 2016-05-09 21:33:47 +00:00
Chong Zhang
6b8f8703ac Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev am: a806e8ab12 
am: 87704f6861

* commit '87704f68614eefb5f475baa7831785eadf6aacd1':
  Fix a flicker when opening app again quickly while it's exiting

Change-Id: Ie0248b72f18eb40d6fe7d4a7daa8455cab860142
 2016-05-09 21:33:18 +00:00
Chong Zhang
4b73b0cf94 Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev am: a806e8ab12 
am: 3f8315a923

* commit '3f8315a923aea0b57f1c086b0bf02d891745a196':
  Fix a flicker when opening app again quickly while it's exiting

Change-Id: I82cf878f3a556bd3a12b6adad2bc7dfe573c253b
 2016-05-09 21:33:15 +00:00
Chong Zhang
3f8315a923 Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev 
am: a806e8ab12

* commit 'a806e8ab1213ef420c9c0d541dbbe96a7d9f1472':
  Fix a flicker when opening app again quickly while it's exiting

Change-Id: I5b993179c73b8204f0a2be922a6a315bfefaca0f
 2016-05-09 21:27:59 +00:00
Chong Zhang
87704f6861 Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev 
am: a806e8ab12

* commit 'a806e8ab1213ef420c9c0d541dbbe96a7d9f1472':
  Fix a flicker when opening app again quickly while it's exiting

Change-Id: I936bcb7b7bd3610a7fb89c9ec51333be3d46506a
 2016-05-09 21:27:57 +00:00
Android Build Merger (Role)
b87b36b4e8 Merge "Merge "Workaround for assist crash with multiwindow" into nyc-dev am: 9fb0e97ecb am: d740e158cc" into nyc-mr1-dev-plus-aosp 2016-05-09 21:20:00 +00:00
Amith Yamasani
1a4a755d33 Merge "Workaround for assist crash with multiwindow" into nyc-dev am: 9fb0e97ecb 
am: d740e158cc

* commit 'd740e158cc030a0fcaf2626c060d6a47e75a15a8':

Change-Id: I0ac16aaaa7c2d174839b7ba2999a1d8827dfded8
 2016-05-09 21:19:34 +00:00
Android Build Merger (Role)
c269befed7 Merge "Merge "Workaround for assist crash with multiwindow" into nyc-dev am: 9fb0e97ecb am: d740e158cc" into nyc-mr1-dev-plus-aosp 2016-05-09 21:17:43 +00:00
Amith Yamasani
9b0330f8db Merge "Workaround for assist crash with multiwindow" into nyc-dev am: 9fb0e97ecb 
am: 6ee39c8086

* commit '6ee39c8086190ef8c020350bd6393d66ae8f5337':
  Workaround for assist crash with multiwindow

Change-Id: I57b007fb123d49de6a784f1f0efc5fb82c089f8c
 2016-05-09 21:17:13 +00:00
Amith Yamasani
684d616f50 Merge "Workaround for assist crash with multiwindow" into nyc-dev am: 9fb0e97ecb 
am: d740e158cc

* commit 'd740e158cc030a0fcaf2626c060d6a47e75a15a8':
  Workaround for assist crash with multiwindow

Change-Id: I777bbac03e58141841e526e86210f574ad84af03
 2016-05-09 21:17:12 +00:00
Chong Zhang
a806e8ab12 Merge "Fix a flicker when opening app again quickly while it's exiting" into nyc-dev 2016-05-09 21:16:49 +00:00
Amith Yamasani
6ee39c8086 Merge "Workaround for assist crash with multiwindow" into nyc-dev 
am: 9fb0e97ecb

* commit '9fb0e97ecb732585d3c8855b459fd1f8e52f7d2b':
  Workaround for assist crash with multiwindow

Change-Id: I06c4d611175b2d85978cf1f0cd2c46a30ca748a3
 2016-05-09 21:11:40 +00:00
Amith Yamasani
d740e158cc Merge "Workaround for assist crash with multiwindow" into nyc-dev 
am: 9fb0e97ecb

* commit '9fb0e97ecb732585d3c8855b459fd1f8e52f7d2b':
  Workaround for assist crash with multiwindow

Change-Id: Ia026329d903ed525990614f9b046bbed3579a96b
 2016-05-09 21:11:33 +00:00
TreeHugger Robot
9fb0e97ecb Merge "Workaround for assist crash with multiwindow" into nyc-dev 2016-05-09 21:04:00 +00:00