commit | f930f804077c94c1dfff7a575b06d8cb66fe7fcf | [log] [tgz] |
---|---|---|
author | yinxu <yinxu@google.com> | Wed Feb 06 11:47:46 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 06 11:47:46 2019 -0800 |
tree | 3259c01a54f87c9a7484ded8804350c1c3bf3a15 | |
parent | 475eabe89e7cc4bc80abf653360dce4842a0416f [diff] | |
parent | 85d64564559a8a19666fd26b404485b8d2361d76 [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: 85d6456455 -s ours am skip reason: subject contains skip directive Change-Id: I5ec1859a23cf60b4267df739034d2e039edf8cec