commit | 68ce6ad89243be383b4c6a835ba06fafb5036165 | [log] [tgz] |
---|---|---|
author | Felipe Leme <felipeal@google.com> | Fri Oct 18 08:58:19 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 18 08:58:19 2019 -0700 |
tree | e337152aa57098d99d89b14a05eb9ee49131d61a | |
parent | f442e119aa63dea1e5e6b6d38fad269641d6a0f7 [diff] | |
parent | 27bac6e681c08200db1b5d768b4acae1204f24ff [diff] |
Merge "[automerger skipped] Merge "Revert "Revert "RESTRICT AUTOMERGE""" into pi-dev am: a1d9c0c414 -s ours am: d968b3eaa1 am: b6ff9d95c0 am: 475257aa86" into qt-qpr1-dev-plus-aosp am: 27bac6e681 -s ours am skip reason: subject contains skip directive Change-Id: I98904b448ead4feaa21e8f68788abfddc6295d74