Merge \"Fix demo launcher\" into nyc-mr1-dev

am: 644dd1aa45

Change-Id: I92cce4e457b9d3110c1421b0393c6e9481338a40
This commit is contained in:
Makoto Onuki
2016-07-29 20:44:15 +00:00
committed by android-build-merger

Diff Content Not Available