tree 920a2c2d5fba1bf2e7122dce66abf854c72906f5
parent 908810533225fe3ca76894e40244a7c53343668e
parent ca1295e93a4aea69b5c07bb50c50ec80b86dadd8
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516747363 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516747363 +0000

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

Change-Id: Ie126a3cdb190104f9e2b404d878f64bf7ec595ae