tree ea02b60dc25a68ffaddc5f34bfd20c98fc4c0505
parent 8fc6c9763ae2d3a92d917cbc5613c8d50f7f6064
parent 8505f4f18289ac6f9f980440e877e888c6cea10f
author Jaegeuk Kim <jaegeuk@google.com> 1539315836 -0700
committer android-build-merger <android-build-merger@google.com> 1539315836 -0700

[automerger skipped] Merge changes from topic "discard" into oc-dev am: 1cc112035f  -s ours
am: 8505f4f182  -s ours

Change-Id: I5d823e82145291fecc0005a183bcd6236a77cb70