commit | d81e308a0de43cae252110e9883032cf80a8c1ab | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Oct 10 21:34:42 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 10 21:34:42 2019 -0700 |
tree | 5c1a6cf7c415457c4784cae8c37aa2069aeffb3b | |
parent | b0136164669a404730e8cfa9c968e142d9a63fb3 [diff] | |
parent | ef85d3f75ca3a6bb10e3ab8ecb2e8caf6b833f98 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge QP1A.191005.007 into master" am: 019d9d0bf7 -s ours am: ef85d3f75c -s ours am skip reason: change_id Ifc7254ab3a5272b056cbc75233aa2dfa8219ea84 with SHA1 b9ad9a68fb is in history Change-Id: I72d12b1dfb30e9a9c57582bdb3e583147b6cbef0