tree e0a9cd6e42c958cdc15b37127ec30000492e2d41
parent d451dfec19cdb6e034cead6d7d44e75ff6559c6d
parent e688e1e6c87ec87928280c795d93d678b908771b
author Hyunyoung Song <hyunyoungs@google.com> 1470246546 +0000
committer android-build-merger <android-build-merger@google.com> 1470246546 +0000

Fix disco bounce crash b/30413641
am: e688e1e6c8

Change-Id: I021ae18ab03c5062bb954691f1a8d89e4fca46c3