diff options
| author | Xin Li <delphij@google.com> | 2019-05-10 01:40:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-10 01:40:31 -0700 |
| commit | 8a3dda0d1c11f9f0476c918ac5772453535fbd9e (patch) | |
| tree | 2e9b2b3d637541d82be43d798c0bd26134c4c925 /res | |
| parent | 6169c05c8b18118a020fdc533bfeb22656ed4783 (diff) | |
| parent | 527c9647f5247df806a6d5931c22081bbcb008bf (diff) | |
| download | Stk-8a3dda0d1c11f9f0476c918ac5772453535fbd9e.tar.gz | |
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 4f3c5c3b23 -s ours am: 8a50c8d2cb -s ours
am: 527c9647f5 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie7f0d21ecd8fbae48b0f528c45857ad9cd5b61ef
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions