[automerger skipped] Detect non-A/B vs. A/B packages correctly. am: f2af5629d2
am: d5c56cee29
-s ours am: 3e5cc2207c
-s ours am: 59c7a40229
-s ours am: 041a5f535f
-s ours
am skip reason: Change-Id I629a533a67966d46d9cd87a59c6b9af26daf1667 with SHA-1 2a4afd29a1
is in history
Change-Id: I6982a5a2a9d1f9f7ed96cbc274b83b8369b76de6
This commit is contained in:
commit
20d2ff2fc5