Commit graph

47878 commits

Author SHA1 Message Date
Christopher Ferris
41cbc227a1 Merge "Fix bug in unwind_info display of exidx frame." am: f835ba6b66 am: a2a376964d
am: d89bc01f4e

Change-Id: Ib825251f4063823e88d9a0a85453cb7c5e9df083
2019-01-29 16:13:22 -08:00
Christopher Ferris
d89bc01f4e Merge "Fix bug in unwind_info display of exidx frame." am: f835ba6b66
am: a2a376964d

Change-Id: I9c688fa7951b799d8f13e13f8ce2e70294f055ed
2019-01-29 15:53:18 -08:00
Christopher Ferris
a2a376964d Merge "Fix bug in unwind_info display of exidx frame."
am: f835ba6b66

Change-Id: If0db919392c6a83ab82fd3845e621f5dfac1f76a
2019-01-29 15:34:32 -08:00
Yifan Hong
bdbd5111a7 Merge "healthd: update owners" am: accdf0e9c7 am: e400542192
am: 75b71ef6df

Change-Id: Id0c2d84baa1be2f3102bdbec801eeef2fc840c3d
2019-01-29 15:23:36 -08:00
Christopher Ferris
f835ba6b66 Merge "Fix bug in unwind_info display of exidx frame." 2019-01-29 23:13:07 +00:00
Yifan Hong
75b71ef6df Merge "healthd: update owners" am: accdf0e9c7
am: e400542192

Change-Id: I28c7e5bd84b956442247c1bc9329406046102c69
2019-01-29 14:48:18 -08:00
Yifan Hong
e400542192 Merge "healthd: update owners"
am: accdf0e9c7

Change-Id: I2d27a71d80bde0584c703c4f5d8e8d5f60d84163
2019-01-29 14:40:53 -08:00
Treehugger Robot
accdf0e9c7 Merge "healthd: update owners" 2019-01-29 22:24:34 +00:00
Tom Cherry
facdaaa181 Merge "Add "instant app" boilerplate." am: 161c439ffb am: ab7c178fc3
am: 8166925f99

Change-Id: I637ea429aa4b3d1ed253589d7ddea58f0fcde638
2019-01-29 13:12:21 -08:00
Tom Cherry
8166925f99 Merge "Add "instant app" boilerplate." am: 161c439ffb
am: ab7c178fc3

Change-Id: I7819c2d0d1bc4f2d7f7ea7c515884ce76853b6aa
2019-01-29 13:04:49 -08:00
Tom Cherry
ab7c178fc3 Merge "Add "instant app" boilerplate."
am: 161c439ffb

Change-Id: I22c4043cb4b276aa992c7e18dbdedf66dea9389a
2019-01-29 12:58:29 -08:00
Treehugger Robot
161c439ffb Merge "Add "instant app" boilerplate." 2019-01-29 20:50:07 +00:00
Yifan Hong
75851f53dc Merge "healthd: charger loads resources from /product" am: 9474063654 am: c85de61ada
am: 2e62511bcb

Change-Id: Ib394be6e96541e21142b9f868ad414bbb7327691
2019-01-29 12:30:31 -08:00
Yifan Hong
2e62511bcb Merge "healthd: charger loads resources from /product" am: 9474063654
am: c85de61ada

Change-Id: I286f8d2a76b2559ef5cb7ddbcf06df9e7afd2078
2019-01-29 12:25:06 -08:00
Yifan Hong
c85de61ada Merge "healthd: charger loads resources from /product"
am: 9474063654

Change-Id: Ie720b289fa5ec9f3fdd11fdf02b9d12d71e3ba89
2019-01-29 12:16:55 -08:00
Florian Mayer
d28fdd21de Merge "Allow to move frames out of Unwinder." am: 9f5e9978c2 am: 319f022506
am: 813f909a2e

Change-Id: I6b3d992928fef6786f34c90d09181649890d70cb
2019-01-29 11:59:16 -08:00
Yifan Hong
9474063654 Merge "healthd: charger loads resources from /product" 2019-01-29 19:57:11 +00:00
Florian Mayer
813f909a2e Merge "Allow to move frames out of Unwinder." am: 9f5e9978c2
am: 319f022506

Change-Id: I59d5ee18e3c59ad5f7e5e2ea299d0ae1c0ecc9b0
2019-01-29 11:47:00 -08:00
Florian Mayer
319f022506 Merge "Allow to move frames out of Unwinder."
am: 9f5e9978c2

Change-Id: I02d888bed24ba754f6b8449676ec7d90ee279f4b
2019-01-29 11:35:12 -08:00
Treehugger Robot
9f5e9978c2 Merge "Allow to move frames out of Unwinder." 2019-01-29 19:23:23 +00:00
Tom Cherry
d722fbf4b0 Add "instant app" boilerplate.
Bug: 123366871
Test: treehugger
Change-Id: I2963aea53ae96651854bbbcb8e411add5183e523
2019-01-29 08:53:01 -08:00
Erick Reyes
f698c7bab3 Merge "meminfo: Add memtrack dmabufinfo library" am: 2cbdc561ad am: 3330640204
am: f2dcb675d3

Change-Id: Ib4b999e6487a6bac823427eb0585486ec3ed272c
2019-01-29 00:56:41 -08:00
Bowgo Tsai
417b2ed6d1 Merge "Adding libfs_avb host tests into presubmit" am: c90b0eafda am: 49ab41e7ab
am: fe578d0f17

Change-Id: Ica44c534c6ddb8495fd2c351599e07a13cc1f845
2019-01-29 00:55:45 -08:00
Tom Cherry
7ce971d636 Merge "Remove extranous reading of fstab in BuilderTest::block_device_info" am: 47a4082f88 am: 9691e45085
am: 064a64167d

Change-Id: I1ac6443246ba4641d34b24b16539d296f09df38d
2019-01-29 00:53:50 -08:00
Tom Cherry
ab66380469 Merge "Remove the rest of users of the old style fstab" am: 286684f835 am: 9eaed18adb
am: cd12736426

Change-Id: I86c21f222595ba43068c20edd95582c66b1d4d15
2019-01-29 00:50:04 -08:00
Martin Stjernholm
019d501145 Merge "Add libnativebridge.so link to vndk_lite linker config." am: 0b6d56e68b am: 8f13a7f400
am: 8da4c5243c

Change-Id: Icdcd1889df0031fc1541f623ca9539ede5287c56
2019-01-29 00:39:18 -08:00
Tom Cherry
f7d7e16d3c Merge "fs_mgr: remove old fs_mgr functions that are not currently used" am: 2648b801ed am: acf95ae6d4
am: 3ef8a6575f

Change-Id: I3546fcb6b4b0433adabf8fd16f33c39fddaaedd0
2019-01-28 23:57:34 -08:00
Erick Reyes
f2dcb675d3 Merge "meminfo: Add memtrack dmabufinfo library" am: 2cbdc561ad
am: 3330640204

Change-Id: I197a094c99e450d16de30b4a02e6260ce424ce3c
2019-01-28 23:24:50 -08:00
Bowgo Tsai
fe578d0f17 Merge "Adding libfs_avb host tests into presubmit" am: c90b0eafda
am: 49ab41e7ab

Change-Id: Iabf27d8358d9861ba215ac7f8c2e73f68552d97b
2019-01-28 23:22:30 -08:00
Tom Cherry
064a64167d Merge "Remove extranous reading of fstab in BuilderTest::block_device_info" am: 47a4082f88
am: 9691e45085

Change-Id: Idd7bdce44b4e560bb22a163bb464f641f8f56315
2019-01-28 23:17:55 -08:00
Tom Cherry
cd12736426 Merge "Remove the rest of users of the old style fstab" am: 286684f835
am: 9eaed18adb

Change-Id: Ie3823464993f17e9335a31901d4b59a38a84451d
2019-01-28 23:11:38 -08:00
Martin Stjernholm
8da4c5243c Merge "Add libnativebridge.so link to vndk_lite linker config." am: 0b6d56e68b
am: 8f13a7f400

Change-Id: I9f8708a66775f2758a36f90b5a94da01280a1263
2019-01-28 23:05:33 -08:00
Tom Cherry
3ef8a6575f Merge "fs_mgr: remove old fs_mgr functions that are not currently used" am: 2648b801ed
am: acf95ae6d4

Change-Id: Id52aebb44ff620a5f200ac3386e71abf88189c53
2019-01-28 22:34:09 -08:00
Steven Moreland
9587ea753e Merge "Move clang-formats to build." am: 66853db0a2 am: 9edd9ebe1d
am: 0d9c2b3991

Change-Id: I96b1b1356b2789ae2456b929766d83170c242603
2019-01-28 22:19:45 -08:00
Greg Kaiser
7beedaf0a5 Merge "adb: Fix incorrect logging statement" am: 32aaba6dcf am: d13559092c
am: c5ba3e1014

Change-Id: If4e5a98de613f84d14b74b7307865ec42f217d3d
2019-01-28 22:18:26 -08:00
Tom Cherry
d8058ca840 Merge changes Ibdecf0c9,I41bd92a7,I5669ed10 am: 561498e357 am: 80fba27032
am: 308f20ba24

Change-Id: I31821adb600a302c8f0d06fb638c7d4c8cc06f13
2019-01-28 22:17:32 -08:00
Erick Reyes
3330640204 Merge "meminfo: Add memtrack dmabufinfo library"
am: 2cbdc561ad

Change-Id: I22ac7d6b6cbea81ca61c3271e8a63d2bac1767ce
2019-01-28 21:46:36 -08:00
Bowgo Tsai
49ab41e7ab Merge "Adding libfs_avb host tests into presubmit"
am: c90b0eafda

Change-Id: I1a07297380f718a22e44a35f9f997bdaed743978
2019-01-28 21:45:30 -08:00
Tom Cherry
9691e45085 Merge "Remove extranous reading of fstab in BuilderTest::block_device_info"
am: 47a4082f88

Change-Id: I9875a9075eacc1e0e556adee3f9411d91e44cd55
2019-01-28 21:44:17 -08:00
Tom Cherry
9eaed18adb Merge "Remove the rest of users of the old style fstab"
am: 286684f835

Change-Id: Ice6d3023349398b2ba5ed99588cc2f457377fb6d
2019-01-28 21:42:24 -08:00
Steven Moreland
0d9c2b3991 Merge "Move clang-formats to build." am: 66853db0a2
am: 9edd9ebe1d

Change-Id: I7170a1d515f7ce0c4c15c69da46db6f7ce9c005d
2019-01-28 21:39:28 -08:00
Martin Stjernholm
8f13a7f400 Merge "Add libnativebridge.so link to vndk_lite linker config."
am: 0b6d56e68b

Change-Id: Ic558af4547212e35e8725a0dab7db1b762cf9afd
2019-01-28 21:39:07 -08:00
Greg Kaiser
c5ba3e1014 Merge "adb: Fix incorrect logging statement" am: 32aaba6dcf
am: d13559092c

Change-Id: Ie9c66e2fc1d74172b3f2420c4d9dc9b7ba7d0c5a
2019-01-28 21:38:40 -08:00
Tom Cherry
308f20ba24 Merge changes Ibdecf0c9,I41bd92a7,I5669ed10 am: 561498e357
am: 80fba27032

Change-Id: Ideebaff704419c9a97d066ca97ead40935779118
2019-01-28 21:37:59 -08:00
Tom Cherry
acf95ae6d4 Merge "fs_mgr: remove old fs_mgr functions that are not currently used"
am: 2648b801ed

Change-Id: Id5cdb57603ccbf58f6c0cda3f071bbb27fabfe93
2019-01-28 21:34:02 -08:00
Steven Moreland
9edd9ebe1d Merge "Move clang-formats to build."
am: 66853db0a2

Change-Id: I005a7e056c9050ec927f59a7f195ddc3f7d39773
2019-01-28 20:09:07 -08:00
Greg Kaiser
d13559092c Merge "adb: Fix incorrect logging statement"
am: 32aaba6dcf

Change-Id: I7900ad07fceb4472744ca0d0c159960dde9dfabf
2019-01-28 20:08:32 -08:00
Tom Cherry
80fba27032 Merge changes Ibdecf0c9,I41bd92a7,I5669ed10
am: 561498e357

Change-Id: Ia0ba17bfee3d97dd4390f942ec7931c2b7a68ea6
2019-01-28 20:07:59 -08:00
Treehugger Robot
2cbdc561ad Merge "meminfo: Add memtrack dmabufinfo library" 2019-01-29 03:33:34 +00:00
Treehugger Robot
c90b0eafda Merge "Adding libfs_avb host tests into presubmit" 2019-01-29 01:46:41 +00:00