tree 98509a6506f6a24088d794c19a5ab16d52ac2a73
parent 8a52e9fd39ebfdd8bafa5ac57798eb75349363dd
parent 368589ea3da5f4697d9c3541efdf3dffe64d1ad0
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516747361 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516747361 +0000

[automerger] bug fix: restore support for broken flag am: 8d009afdbb  -s ours am: 368589ea3d

Change-Id: If59793229ee92fe1c0268ef6b8bf750b9c76752f