tree d17a5d69f5d70420449c57d439d29de476ac2c28
parent 3654a5b10e9a048b7c5bb12dc4e734aceccc4ce6
parent 5cd38451fb4bb6390ab3f8866c3cdfdce9133fbf
author Jaegeuk Kim <jaegeuk@google.com> 1539316215 -0700
committer android-build-merger <android-build-merger@google.com> 1539316215 -0700

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

Change-Id: Idaf4cb4ea2a1623f479a036660213fcf93364bb0