tree aeca8943f86ca557f92b7e8109e5002ffe575545
parent 7653b07faf10f85a3ef6c94b06204e4c52ecccfc
parent 0680788dbad3ebd5c3e11110ac381d5a80cb92fc
author Trevor Johns <trevorjohns@google.com> 1475192661 +0000
committer android-build-merger <android-build-merger@google.com> 1475192661 +0000

Merge "Syncing latest sample prebuilts for nyc-dev." into nyc-dev
am: 0680788dba

Change-Id: I18e2a39bbdb210b15a8f0a4f72116c31d8fa5550