commit | 85d64564559a8a19666fd26b404485b8d2361d76 | [log] [tgz] |
---|---|---|
author | yinxu <yinxu@google.com> | Wed Feb 06 11:23:56 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 06 11:23:56 2019 -0800 |
tree | de634defd083127aa9b7308b6447b016f7046db6 | |
parent | a55c3e839df17d0599ce0004011443642ebdbff5 [diff] | |
parent | 908e5fc2a45808fe66c61e47303f17dd89539192 [diff] |
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Backport aosp/880799 and aosp/871129 from master to pie-cts-dev" into pie-cts-dev am: a6e1a88643 -s ours am: 908e5fc2a4 -s ours am skip reason: subject contains skip directive Change-Id: I89329e7f2491410dc8a7a1450b839fd60d21cbb2