Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,162 Commits 3 Branches 0 Tags
aa22928a952b7983ee62afba641d044bede42a6f
Commit Graph

253162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
aa22928a95 Merge "Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am: e1a71fdd67 am: 647058d499 am: 4c80554405" into nyc-mr1-dev-plus-aosp 2016-05-12 22:10:33 +00:00
Android Build Merger (Role)
3895e59548 Merge "Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df am: 0513394f85" into nyc-mr1-dev-plus-aosp 2016-05-12 22:10:25 +00:00
smain@google.com
f436b21bc3 Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am: e1a71fdd67 am: 647058d499 
am: 4c80554405

* commit '4c8055440553ab92e362096035e1c86dad33cf91':
  missed another old link

Change-Id: I3facd0c8d3880a99a6b4e1739736d3df210025a8
 2016-05-12 22:10:00 +00:00
Philip Cuadra
441608e385 Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df 
am: 0513394f85

* commit '0513394f85385d6bfa7866f1a958b038dc2826d9':

Change-Id: Id9e4af09c566d57a613ff05999c4c14bfcf59388
 2016-05-12 22:09:57 +00:00
Android Build Merger (Role)
4a8f48446c Merge "Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df am: 0513394f85" into nyc-mr1-dev-plus-aosp 2016-05-12 22:08:20 +00:00
Philip Cuadra
e47be8cd79 Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df 
am: 0513394f85

* commit '0513394f85385d6bfa7866f1a958b038dc2826d9':
  Pinner service for pinning files into memory

Change-Id: I85715567c54212669898b29c64309a548518a595
 2016-05-12 22:07:55 +00:00
Philip Cuadra
d49592805f Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df 
am: 5fcabe19a7

* commit '5fcabe19a76a06d25358e9889323353f72a94547':
  Pinner service for pinning files into memory

Change-Id: Ia7dc78c32f2beb9c16bf15ac41defc63e51be0e1
 2016-05-12 22:07:43 +00:00
Scott Main
4c80554405 Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am: e1a71fdd67 
am: 647058d499

* commit '647058d49975c49123f66c8f7ea127cfc6ca7def':
  missed another old link

Change-Id: Ief64115701727aad73cc320af1768075a0c2cfa2
 2016-05-12 22:07:30 +00:00
Philip Cuadra
5fcabe19a7 Merge "Pinner service for pinning files into memory" into nyc-dev 
am: b41088b4df

* commit 'b41088b4dfa8b077541cd3be69c51bd4bba4e938':
  Pinner service for pinning files into memory

Change-Id: I404f6844fb5bf4a097d3d862a9294cb58484d176
 2016-05-12 22:04:36 +00:00
Philip Cuadra
0513394f85 Merge "Pinner service for pinning files into memory" into nyc-dev 
am: b41088b4df

* commit 'b41088b4dfa8b077541cd3be69c51bd4bba4e938':
  Pinner service for pinning files into memory

Change-Id: I6dc3f40dbbb5e327976f665de1451eb1d416ee2a
 2016-05-12 22:04:26 +00:00
smain@google.com
647058d499 Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf 
am: e1a71fdd67

* commit 'e1a71fdd67a6eb0aa370be09b0bb33a166549024':
  missed another old link

Change-Id: Ic456f5624f31cce4f3bea2d3b938c9ab4ceec87a
 2016-05-12 22:04:21 +00:00
Scott Main
e1a71fdd67 Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 
am: 9535aa73bf

* commit '9535aa73bfa0b92f5e7b1610cca98f0dc33e2894':
  missed another old link

Change-Id: Ife2b4f674610ae48e1c126c42e498ecc7f27bece
 2016-05-12 22:02:01 +00:00
smain@google.com
9535aa73bf Merge "missed another old link" into mnc-mr-docs 
am: 4e0de0df78

* commit '4e0de0df78499ea83a2c31942a31dee9226960e6':
  missed another old link

Change-Id: I382e852fed3d004ea9ea18cb00a47f0895f02b3f
 2016-05-12 21:59:34 +00:00
Philip Cuadra
b41088b4df Merge "Pinner service for pinning files into memory" into nyc-dev 2016-05-12 21:55:29 +00:00
Scott Main
4e0de0df78 Merge "missed another old link" into mnc-mr-docs 2016-05-12 21:51:15 +00:00
Android Build Merger (Role)
390091ec01 Merge "Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b am: 69efd6c0c2" into nyc-mr1-dev-plus-aosp 2016-05-12 21:26:18 +00:00
Jesse Hall
d4b45aaa0d Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b 
am: 69efd6c0c2

* commit '69efd6c0c2891ea39d53942824603462699f7878':

Change-Id: Ic148c2579e9fcf4eacf2fde96f43169ff6e885af
 2016-05-12 21:25:59 +00:00
Android Build Merger (Role)
263dac8572 Merge "Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b am: 69efd6c0c2" into nyc-mr1-dev-plus-aosp 2016-05-12 21:24:19 +00:00
Jesse Hall
eaa6a6602a Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b 
am: 69efd6c0c2

* commit '69efd6c0c2891ea39d53942824603462699f7878':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I91f82396bdb4eceb33f8d1a4c733d9163b2f9682
 2016-05-12 21:23:54 +00:00
Jesse Hall
61820a6a63 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b 
am: 76766d29b3

* commit '76766d29b33ebb059d36bc20dd2a1c364ebe2eca':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I251ec5b438024e7cb878bab4368881272baeb2fc
 2016-05-12 21:23:51 +00:00
Dimitry Ivanov
76766d29b3 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev 
am: 7f0708390b

* commit '7f0708390b3006965fe640c72c4254eb74daca3a':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I406dad31babb52d601e1212c4672f1ce7cd9aa57
 2016-05-12 21:21:25 +00:00
Dimitry Ivanov
69efd6c0c2 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev 
am: 7f0708390b

* commit '7f0708390b3006965fe640c72c4254eb74daca3a':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I1adef3e79249cea465a3043c39bccd07dbfe805a
 2016-05-12 21:21:23 +00:00
Android Build Merger (Role)
d571dc2760 Merge "Merge "Add getEsn()." into nyc-mr1-dev am: 16717be173" into nyc-mr1-dev-plus-aosp 2016-05-12 21:14:28 +00:00
Android Build Merger (Role)
f40d252a74 Merge "Merge "fix filter for listeners that are not the rocket" into nyc-dev am: 2e35847a8f am: 3f62cb6318" into nyc-mr1-dev-plus-aosp 2016-05-12 21:14:10 +00:00
Youhan Wang
58f48aa955 Merge "Add getEsn()." into nyc-mr1-dev 
am: 16717be173

* commit '16717be1738c29ad4f3dd992121ad4bac8b8d5c1':
  Add getEsn().

Change-Id: I43db23cff359f906b7d6a5bbc50b3cf490a7371c
 2016-05-12 21:13:43 +00:00
Chris Wren
50a240821f Merge "fix filter for listeners that are not the rocket" into nyc-dev am: 2e35847a8f 
am: 3f62cb6318

* commit '3f62cb63186548f5496cdde68e40fe3943190e2f':

Change-Id: I1b482550341479753494149055095dcce368f009
 2016-05-12 21:13:40 +00:00
Jesse Hall
7f0708390b Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev 2016-05-12 21:13:26 +00:00
Android Build Merger (Role)
17cb856d39 Merge "Merge "fix filter for listeners that are not the rocket" into nyc-dev am: 2e35847a8f am: 3f62cb6318" into nyc-mr1-dev-plus-aosp 2016-05-12 21:11:56 +00:00
Chris Wren
33e8ce084f Merge "fix filter for listeners that are not the rocket" into nyc-dev am: 2e35847a8f 
am: 3f62cb6318

* commit '3f62cb63186548f5496cdde68e40fe3943190e2f':
  fix filter for listeners that are not the rocket

Change-Id: I1c3f1d88b928940e3bdbd07d8f9ab3705b1cc67c
 2016-05-12 21:11:30 +00:00
Chris Wren
9b7d0c4bf1 Merge "fix filter for listeners that are not the rocket" into nyc-dev am: 2e35847a8f 
am: 7be0d1ca4e

* commit '7be0d1ca4e1954dbbada041aa1d34713f217b1af':
  fix filter for listeners that are not the rocket

Change-Id: I8208c6277851cc93e4d66dafd6acbe19aaf5290f
 2016-05-12 21:11:28 +00:00
Youhan Wang
16717be173 Merge "Add getEsn()." into nyc-mr1-dev 2016-05-12 21:09:43 +00:00
Chris Wren
7be0d1ca4e Merge "fix filter for listeners that are not the rocket" into nyc-dev 
am: 2e35847a8f

* commit '2e35847a8f9557b59198fc053524eee0b965aab8':
  fix filter for listeners that are not the rocket

Change-Id: I00092556795bb085060508cb18f62fbeecf42d09
 2016-05-12 21:08:56 +00:00
Chris Wren
3f62cb6318 Merge "fix filter for listeners that are not the rocket" into nyc-dev 
am: 2e35847a8f

* commit '2e35847a8f9557b59198fc053524eee0b965aab8':
  fix filter for listeners that are not the rocket

Change-Id: Ieb343c93c78dbafb937a14abff6a868d1f44ecc9
 2016-05-12 21:08:51 +00:00
TreeHugger Robot
2e35847a8f Merge "fix filter for listeners that are not the rocket" into nyc-dev 2016-05-12 21:05:37 +00:00
Android Build Merger (Role)
c2d7ba6b94 Merge "Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b am: a4f8525fdc" into nyc-mr1-dev-plus-aosp 2016-05-12 21:04:18 +00:00
Adrian Roos
daa4b785d5 Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b 
am: a4f8525fdc

* commit 'a4f8525fdcfd49f9387bbbd532b86cf0524608a7':

Change-Id: I8696ae08d44bc4be15a58810aff14339499b67bc
 2016-05-12 21:03:51 +00:00
Android Build Merger (Role)
0433241074 Merge "Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b am: a4f8525fdc" into nyc-mr1-dev-plus-aosp 2016-05-12 21:02:00 +00:00
Adrian Roos
728220de81 Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b 
am: a4f8525fdc

* commit 'a4f8525fdcfd49f9387bbbd532b86cf0524608a7':
  DPM control for remote input when locked

Change-Id: Ie55e0bf1184bcc6443ce4ea5ff8b025f9479e9e6
 2016-05-12 21:01:35 +00:00
Adrian Roos
d5bd2b647c Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b 
am: f46fdf877e

* commit 'f46fdf877ef54adc236698635967ff79d7a0dfe2':
  DPM control for remote input when locked

Change-Id: I7eb3cdf17b4a61865bfe85ae6d9c281b113aeb9f
 2016-05-12 21:01:32 +00:00
Adrian Roos
a4f8525fdc Merge "DPM control for remote input when locked" into nyc-dev 
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: Id7074ffdc541d53d4607652cefc4bfdecaaaa335
 2016-05-12 20:58:55 +00:00
Adrian Roos
f46fdf877e Merge "DPM control for remote input when locked" into nyc-dev 
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: I330777f47f51dee00623ace614271f42b6d4fca7
 2016-05-12 20:58:53 +00:00
Adrian Roos
11c8f5315b Merge "DPM control for remote input when locked" into nyc-dev 2016-05-12 20:52:26 +00:00
Android Build Merger (Role)
867ea79564 Merge "Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039 am: aa50ecd967 am: 8d18eefe50 am: cb2e3c61aa" into nyc-mr1-dev-plus-aosp 2016-05-12 20:44:42 +00:00
Android Build Merger (Role)
1fd10ad291 Merge "Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039 am: aa50ecd967 am: 8d18eefe50 am: ff665c8f83" into nyc-mr1-dev-plus-aosp 2016-05-12 20:44:34 +00:00
Android Build Merger (Role)
d179754838 Merge "Merge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf613dea am: 5660e4ed82 am: f6661535ab am: 4d50987762 am: 9c751b8ca8" into nyc-mr1-dev-plus-aosp 2016-05-12 20:44:19 +00:00
Dirk Dougherty
3114d4c959 Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039 am: aa50ecd967 am: 8d18eefe50 
am: cb2e3c61aa

* commit 'cb2e3c61aa67af1bcfc94ce62686c747d9e70445':
  Update billions page related links.

Change-Id: I78258b875070e520a464b0c8d64fe949a553a3a5
 2016-05-12 20:44:11 +00:00
Dirk Dougherty
63d1d4032e Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039 am: aa50ecd967 am: 8d18eefe50 
am: ff665c8f83

* commit 'ff665c8f837f19f352d6a0fda7c64b674a12d57b':
  Update billions page related links.

Change-Id: I481b5c4d96c1420677eb42933a19fd2fef0a37ed
 2016-05-12 20:43:49 +00:00
Liz Yepsen
a43e061468 Merge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf613dea am: 5660e4ed82 am: f6661535ab am: 4d50987762 
am: 9c751b8ca8

* commit '9c751b8ca88b630e1baf511812a0a2e8c3f1431e':

Change-Id: I8d8d5d20216cc1b150a99e3a7577e5749197d570
 2016-05-12 20:43:44 +00:00
Android Build Merger (Role)
cf23898cab Merge "Merge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf613dea am: 5660e4ed82 am: f6661535ab am: 4d50987762 am: 9c751b8ca8" into nyc-mr1-dev-plus-aosp 2016-05-12 20:41:49 +00:00
Dirk Dougherty
cb2e3c61aa Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039 am: aa50ecd967 
am: 8d18eefe50

* commit '8d18eefe50ac574fdca3090ca12d94e307321a33':
  Update billions page related links.

Change-Id: I932341640979046edd3a13986d10ef3d95502454
 2016-05-12 20:41:25 +00:00