commit | bc8c1d569a01dae9a8e6e7e1882fac1a9d64e77d | [log] [tgz] |
---|---|---|
author | yinxu <yinxu@google.com> | Wed Feb 06 11:15:55 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 06 11:15:55 2019 -0800 |
tree | 3259c01a54f87c9a7484ded8804350c1c3bf3a15 | |
parent | 3f79b2b7acfc69e0d8ae5103737c1215072f656c [diff] | |
parent | 097adb8f7759f79a54fe6577ed89a9e7e452e9c2 [diff] |
[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: 097adb8f77 Change-Id: I01d2508afa0a8d1e337662f930d3fff760a5228b