 Xin Li
|
f531c6dc79
|
[automerger skipped] DO NOT MERGE am: c020ac4b78 -s ours
am: ae78a1a65e -s ours
Change-Id: I89fb7af89188f9d046e082a998f0c69875de283a
|
2018-12-10 11:13:17 -08:00 |
|
|
Xin Li
|
ae78a1a65e
|
[automerger skipped] DO NOT MERGE
am: c020ac4b78 -s ours
Change-Id: I0e13b090f2aa21482afcf798333e20441fae0873
|
2018-12-10 10:10:14 -08:00 |
|
|
Xin Li
|
c020ac4b78
|
DO NOT MERGE
Merge pie-platform-release (PPRL.181205.001, history only) into master
Bug: 120502534
Change-Id: Id931c19bd78c83aa24c821f12691f92925fdafbe
|
2018-12-07 16:14:49 -08:00 |
|
|
Xin Li
|
22810c53b8
|
Merge Android Pie into master am: 35e712c85b am: e6fe1592b3
am: 8b483ba642
Change-Id: Ibe891fee7857c9e771291e2fa0ff45f8c8f3ea38
|
2018-08-07 22:48:49 -07:00 |
|
|
Xin Li
|
8b483ba642
|
Merge Android Pie into master am: 35e712c85b
am: e6fe1592b3
Change-Id: Ic03ccbe728a5251e5f6947c6b3fe04cb3f29f094
|
2018-08-07 18:32:11 -07:00 |
|
|
Xin Li
|
e6fe1592b3
|
Merge Android Pie into master
am: 35e712c85b
Change-Id: I0b3e50462003eb0c0ea77059b3e671812b9a447e
|
2018-08-07 15:01:25 -07:00 |
|
|
Xin Li
|
35e712c85b
|
Merge Android Pie into master
Bug: 112104996
Change-Id: Ia50af15c2dbe544047e806de7d0ecff91385bf2c
|
2018-08-06 16:51:20 -07:00 |
|
|
Xin Li
|
8fb99c8d81
|
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 268d3c8ccc
Change-Id: I9783d2c9fa432af7d528727e7fed215cb1cee4dd
|
2018-06-09 03:18:04 -07:00 |
|
|
Xin Li
|
268d3c8ccc
|
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: Ie77e61094c5a4ec4c46c88e5d9659baab61dfd8b
|
2018-06-08 11:08:01 -07:00 |
|
|
Xin Li
|
6337883a56
|
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: cd9ba9e128
Change-Id: I1d26b974d483b727ff1f023838cd3ac121ffa86c
|
2017-11-15 02:36:20 +00:00 |
|
|
Xin Li
|
cd9ba9e128
|
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: Ieafa1d7163c3b586f9daa34a8b8239ea57db6636
|
2017-11-14 16:38:23 -08:00 |
|
|
Xin Li
|
8f6c644d6f
|
Merge commit 'b2dd6a8ef54b233843b463204ec4e3b67148a7e8' into HEAD
Change-Id: Id7e29d1428552414abd16ac7cd17d86b51e61658
|
2017-11-13 14:35:43 -08:00 |
|