device_common - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Snap for 6047641 from a766aad7998794ac62991fcd7b67aecb341750e4 to qt-d4-releaseandroid-10.0.0_r45 android-10.0.0_r44 android-10.0.0_r43 android-10.0.0_r42 android10-d4-s1-release android10-d4-release	android-build-team Robot	2019-12-04	1	-5/+2
\|\ \| \| \| \| \| \|	Change-Id: I04e751f5625c27c3ed5953b16147030f9f8c0128
\| *	Copy Android.mk for all vendorsandroid-10.0.0_r41 android-10.0.0_r40 android-10.0.0_r39 android-10.0.0_r38 android-10.0.0_r37 android10-qpr3-s1-release android10-qpr3-release	Bill Yi	2019-12-03	1	-5/+2
\|/ \| \| \| \| \| \|	BUG:143903156 Merged-In: Ibea15ac3647ed4dca38bcf68ca336bc9154a7328 Change-Id: Ibea15ac3647ed4dca38bcf68ca336bc9154a7328 (cherry picked from commit d88009ebcfd9c2b53c7f2af6f1d12ec5725d8417)
*	Add coral/flame support in common scriptsandroid-mainline-10.0.0_r4 android10-qpr1-mainline-release android10-mainline-media-release	Bill Yi	2019-06-05	1	-12/+16
\| \| \| \| \| \| \| \| \|	Done a little bit refactoring so we don't need to explicitly add new devices any more. TEST:generated blobs and build with the qt aosp source, flashed devices BUG:130808032 Change-Id: Ia4f6f807dd3ff15dd78722331890e991dfc6430c
*	Refuse to flash if fastboot has no knowledge about dynamic partitionandroid10-dev	Bill Yi	2019-02-26	1	-2/+2
\| \| \| \| \| \| \|	TEST: compared with the fastboot --version 28.0.1 and 28.0.2 BUG:120105455 Change-Id: I4a7b2741b9733181842a411b536e5e3e0a82fa4c
*	[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into ↵	Xin Li	2019-02-25	0	-0/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stage-aosp-master am: 5325d6e50a -s ours am: 60ce7db936 -s ours am skip reason: subject contains skip directive Change-Id: If98f33d470636700e6c60718115b075d1e5d01c9
\| *	[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master	Xin Li	2019-02-25	0	-0/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 5325d6e50a -s ours am skip reason: subject contains skip directive Change-Id: I81cdf7f4cf75c5dc7e205358e0bca612c6e10d44
\| \| *	DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master	Xin Li	2019-02-21	1	-1/+14
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 120848293 Change-Id: I22e5c84c3d8061a6f6dda2180d219a35532b2cf9
* \| \| \|	Merge "Clean up N6 shamu section" am: 6450e71814 am: f8e99ae2c3	Bill Yi	2019-02-14	1	-9/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 2d2b3de271 Change-Id: Iffa4c04d05c04d2eea0a9a36c7e1ed27d5d7cfce
\| * \| \|	Merge "Clean up N6 shamu section" am: 6450e71814	Bill Yi	2019-02-14	1	-9/+0
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: f8e99ae2c3 Change-Id: I1cfdb3fc3081f503ebf5343860d15276513e9ed4
\| \| * \|	Merge "Clean up N6 shamu section"	Bill Yi	2019-02-14	1	-9/+0
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 6450e71814 Change-Id: I27c981c2f432167811983a12a0a1fc9805d306d6
\| \| \| * \	Merge "Clean up N6 shamu section"android-q-preview-6 android-q-preview-5 android-q-preview-4 android-q-preview-2.5 android-q-preview-1 android-o-mr1-iot-release-1.0.12 android-o-mr1-iot-release-1.0.10 oreo-mr1-iot-release	Bill Yi	2019-02-14	1	-9/+0
\| \| \| \|\ \
\| \| \| \| * \|	Clean up N6 shamu section	Bill Yi	2019-02-12	1	-9/+0
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I264166eb375113c00aec3c1dad06ea9ab3388bc7
* \| \| \| \|	Refactor the logic for vendor blobs APKs am: 905dd3d103	Bill Yi	2019-02-06	1	-38/+13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 741eabda98 Change-Id: If805f1eb6cbaf5a370fb1993fbc039c99d933902
\| * \| \| \|	Refactor the logic for vendor blobs APKs	Bill Yi	2019-02-06	1	-38/+13
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 905dd3d103 Change-Id: Id8fb1a5d3d53ab33d410ee67acdadccddb50e919
\| \| * \| \|	Refactor the logic for vendor blobs APKsandroid-9.0.0_r47 android-9.0.0_r45 android-9.0.0_r42 pie-qpr3-b-release	Bill Yi	2019-02-04	1	-38/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The APKs makefiles are more complex now than then. We will add the makefiles in the device self-extract directory. Just copy over to the same directoy as of the APK file BUG:117168130 Change-Id: Ie8daa054d683cd42f0f8761c87048f27a088a7e6
* \| \| \| \|	Add B4S4 to the common scripts. am: 0b45b1e762	Bill Yi	2019-01-11	1	-1/+14
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 54ec5949d6 Change-Id: I8e9f86bf58ad9b499a8ad586d592fdb94476d0cd
\| * \| \| \|	Add B4S4 to the common scripts.	Bill Yi	2019-01-11	1	-1/+14
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 0b45b1e762 Change-Id: I3d6282de3e7fdcfba92e8c1a67b53b03a5946981
\| \| * \| \|	Add B4S4 to the common scripts.pie-b4s4-dev	Bill Yi	2019-01-11	1	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	B4S4 has similar design structure with B1C1 TEST:Generated blobs. Make. Flashed devices BUG:117168130 Change-Id: I59c3639fd1b4525d7ee10417fc36f8d4ebeec6b3
* \| \| \| \|	Refuse to flash if fastboot has no knowledge about dynamic partition	Bill Yi	2019-01-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BUG:120105455 Change-Id: I05a782774cb483897def873f40cbbd8a883db170
* \| \| \| \|	[automerger skipped] Merge "DO NOT MERGE" am: 6970adda2f -s ours am: ↵	The Android Open Source Project	2018-12-06	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	89ccad36eb -s ours am: 066d82601b -s ours Change-Id: Ib0018555e4b719473b4254f366db92b0daf7d3c3
\| * \| \| \|	[automerger skipped] Merge "DO NOT MERGE" am: 6970adda2f -s ours	The Android Open Source Project	2018-12-06	0	-0/+0
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 89ccad36eb -s ours Change-Id: I745ddcae9710f35b58fb8b176273a0a1ec7c73fa
\| \| * \| \|	[automerger skipped] Merge "DO NOT MERGE"	The Android Open Source Project	2018-12-06	0	-0/+0
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 6970adda2f -s ours Change-Id: I7d4bc80e39afcdf15a6650de564cecb77d75f84c
\| \| \| * \|	Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8 android-o-mr1-iot-release-1.0.7	Treehugger Robot	2018-12-07	0	-0/+0
\| \| \| \|\ \
\| \| \| \| * \|	DO NOT MERGE	The Android Open Source Project	2018-12-06	0	-0/+0
\| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pie-platform-release (PPRL.181105.017, history only) into master Bug: 118454372 Change-Id: I73e25f302dd0a884ec0a1660ed2a7f1aefb9aba1
\| \| \| \| * \|	Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release	Bill Yi	2018-11-28	2	-5/+15
\| \| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I1591a59754abf48a6d53ae990f578dcfa055e14d
* \| \| \| \| \|	[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵	Bill Yi	2018-10-24	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MERGE am: 044c53ddf1 -s ours am: 9ae1e961f6 -s ours am: e03563c2c3 -s ours Change-Id: I2aecda0e569383a34f0ade00ccce9b2f5576b086
\| * \| \| \| \|	[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵	Bill Yi	2018-10-24	0	-0/+0
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MERGE am: 044c53ddf1 -s ours am: 9ae1e961f6 -s ours Change-Id: I9896a67b846c6d2680a111ea04144378c3fdeaf9
\| \| * \| \| \|	[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE	Bill Yi	2018-10-24	0	-0/+0
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 044c53ddf1 -s ours Change-Id: I7a903233a22db6b37b77d5e90b75610d157fed8f
\| \| \| * \| \|	Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2 android-o-mr1-iot-release-smart-display-r9 android-o-mr1-iot-release-smart-display-r8 android-o-mr1-iot-release-smart-display-r5 android-o-mr1-iot-release-smart-display-r4 android-o-mr1-iot-release-smart-display-r22 android-o-mr1-iot-release-smart-display-r14 android-o-mr1-iot-release-smart-clock-r6 android-o-mr1-iot-release-smart-clock-r2 android-o-mr1-iot-release-smart-clock-fsi android-o-mr1-iot-release-smart-clock-fcs android-n-iot-release-ihome-igv1 nougat-iot-release	Bill Yi	2018-10-24	0	-0/+0
\| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ibc78125534242c01a80dd32dabb50fc1cbc8e7cb
* \| \| \| \| \|	[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵	Bill Yi	2018-10-24	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MERGE am: 2b20a00ae4 -s ours am: 04df8e7fab -s ours Change-Id: I98c86067e9eb23b0d050db05be0f50019f9e02a6
\| * \| \| \| \|	[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵	Bill Yi	2018-10-24	0	-0/+0
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MERGE am: 2b20a00ae4 -s ours Change-Id: I1280f9ea83bc412486107d57c047edca135e4157
\| \| * \| \| \|	Merge pi-platform-release to stage-aosp-master - DO NOT MERGE	Bill Yi	2018-10-24	0	-0/+0
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \|	Change-Id: I6900e7c06996b85dae356a127a71f0d91e56acb6
\| \| \| * \| \|	Snap for 4603395 from daf5fd599d02bed1442f488a879471837770cd9b to pi-releaseandroid-wear-9.0.0_r9 android-wear-9.0.0_r8 android-wear-9.0.0_r7 android-wear-9.0.0_r6 android-wear-9.0.0_r5 android-wear-9.0.0_r4 android-wear-9.0.0_r3 android-wear-9.0.0_r23 android-wear-9.0.0_r22 android-wear-9.0.0_r21 android-wear-9.0.0_r20 android-wear-9.0.0_r2 android-wear-9.0.0_r19 android-wear-9.0.0_r18 android-wear-9.0.0_r17 android-wear-9.0.0_r16 android-wear-9.0.0_r15 android-wear-9.0.0_r14 android-wear-9.0.0_r13 android-wear-9.0.0_r12 android-wear-9.0.0_r11 android-wear-9.0.0_r10 android-wear-9.0.0_r1 android-vts-9.0_r9 android-vts-9.0_r8 android-vts-9.0_r7 android-vts-9.0_r6 android-vts-9.0_r5 android-vts-9.0_r4 android-vts-9.0_r14 android-vts-9.0_r13 android-vts-9.0_r12 android-vts-9.0_r11 android-vts-9.0_r10 android-cts-9.0_r9 android-cts-9.0_r8 android-cts-9.0_r7 android-cts-9.0_r6 android-cts-9.0_r5 android-cts-9.0_r4 android-cts-9.0_r3 android-cts-9.0_r2 android-cts-9.0_r13 android-cts-9.0_r12 android-cts-9.0_r11 android-cts-9.0_r10 android-cts-9.0_r1 android-9.0.0_r9 android-9.0.0_r8 android-9.0.0_r7 android-9.0.0_r60 android-9.0.0_r6 android-9.0.0_r59 android-9.0.0_r58 android-9.0.0_r57 android-9.0.0_r56 android-9.0.0_r55 android-9.0.0_r54 android-9.0.0_r53 android-9.0.0_r52 android-9.0.0_r51 android-9.0.0_r50 android-9.0.0_r5 android-9.0.0_r49 android-9.0.0_r48 android-9.0.0_r3 android-9.0.0_r2 android-9.0.0_r18 android-9.0.0_r17 android-9.0.0_r10 android-9.0.0_r1 security-pi-release pie-vts-release pie-security-release pie-s2-release pie-release-2 pie-release pie-r2-s2-release pie-r2-s1-release pie-r2-release pie-cts-release	android-build-team Robot	2018-02-14	1	-0/+10
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I22dad7a06f187e23f8332b3fa99490713d0f99af
\| \| \| * \ \ \	Snap for 4428213 from 59f90baa4f5ad3e3b3eeb4dd558e839b057a048f to pi-release	android-build-team Robot	2017-11-01	1	-0/+8
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ibcaa5edcfcf44e8eae89e12339cb9ec44f852e58
* \| \| \| \| \| \| \|	Merge pi-dr1-dev to aosp-master am: d6b6d84b94 am: 3f65078986	Bill Yi	2018-10-19	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 120cb28220 Change-Id: I632850e592f813bf6e8210081a5fc029d33626e2
\| * \| \| \| \| \| \|	Merge pi-dr1-dev to aosp-master am: d6b6d84b94	Bill Yi	2018-10-19	0	-0/+0
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 3f65078986 Change-Id: I0cde3aef40d460e4526c32f3b76cc03a44cd6c99
\| \| * \| \| \| \| \|	Merge pi-dr1-dev to aosp-master	Bill Yi	2018-10-19	0	-0/+0
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: d6b6d84b94 Change-Id: I0b8ccf3ec3c4dae9f0bd549f6f69d55e8b201473
\| \| \| * \| \| \| \|	Merge pi-dr1-dev to aosp-master	Bill Yi	2018-10-19	2	-5/+15
\| \| \| \|\ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I508adc5f1f407291b219d47338fa76af21e7ea44
* \| \| \| \| \| \| \|	Merge stage-dr1-aosp-master into stage-aosp-master am: e8c82ea0c9	Xin Li	2018-08-13	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: facb965cd6 Change-Id: If5b7573ab1b97bc37c05fd41863310f02848d7fe
\| * \| \| \| \| \| \|	Merge stage-dr1-aosp-master into stage-aosp-master	Xin Li	2018-08-13	0	-0/+0
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: e8c82ea0c9 Change-Id: I865bee6ccec7771a28aadcb125ef16659c24a08e
\| \| * \| \| \| \| \|	Merge stage-dr1-aosp-master into stage-aosp-masterpie-temp	Xin Li	2018-08-13	2	-5/+15
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 112535855 Change-Id: Icdcae9e711c6a2f979312a56b5ddc67b2a58f4e8
* \| \| \| \| \| \| \| \|	Merge "Merge Android Pie into master" am: c57ad4809b am: aba5302b37 am: ↵	Xin Li	2018-08-08	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ec2cfee884 am: d4beed7de2 Change-Id: Ica2d3d4aa40566f084baec4983e981665ea6d134
\| * \| \| \| \| \| \| \|	Merge "Merge Android Pie into master" am: c57ad4809b am: aba5302b37	Xin Li	2018-08-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: ec2cfee884 Change-Id: I022bcf8098152a6fe4486d1d25ebbf6a2175582c
\| \| * \| \| \| \| \| \|	Merge "Merge Android Pie into master" am: c57ad4809b	Xin Li	2018-08-07	0	-0/+0
\| \|/\| \| \| \| \| \| \| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: aba5302b37 Change-Id: Ide72b17d0cfc12d09cba26831b94a5e380323f98
\| \| * \| \| \| \| \|	Merge "Merge Android Pie into master"	Xin Li	2018-08-07	0	-0/+0
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: c57ad4809b Change-Id: Ie69d9334e6fabb0465594275fc263210f082abfc
\| \| \| * \| \| \| \|	Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3 android-o-mr1-iot-release-1.0.5 android-o-mr1-iot-release-1.0.4 android-o-mr1-iot-release-1.0.3 oreo-mr1-1.2-iot-release master-cuttlefish-testing-release	Xin Li	2018-08-07	1	-0/+8
\| \| \| \|\ \ \ \ \
\| \| \| \| * \| \| \| \|	Merge Android Pie into master	Xin Li	2018-08-06	1	-0/+8
\| \| \| \|/\| \| \| \| \| \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 112104996 Change-Id: I928f076bf46ebdbf00892fe6ba86171b1c9cb63d
* \| \| \| \| \| \| \|	Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: a2fa7e3427	Xin Li	2018-07-20	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: f6159ec1e7 Change-Id: I2b457c00bffe0e57e137d8627d436ccdd112e951
\| * \| \| \| \| \| \|	Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master	Xin Li	2018-07-19	0	-0/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: a2fa7e3427 Change-Id: I919bdfa04ba38b29d1ecee53df67e95ed2b902b3
\| \| * \ \ \ \ \ \	Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master	Xin Li	2018-07-19	2	-5/+15
\| \| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| / / / / / / \| \| \|/ / / / / / \| \| \| \| \| \| \| \|	Bug: 111615259 Change-Id: I4f077688a9cd10aa350670be79b00b44488ba65b