tree e6d6d01dd574c24a90d4ec4bcd3cbf12d016c425
parent 9b2a56476486fd380a91812eaf32f08e4290c25f
parent 34639cbbabae6c434621a6ce32bf37e7f551a928
author Hall Liu <hallliu@google.com> 1502926802 +0000
committer android-build-merger <android-build-merger@google.com> 1502926802 +0000

Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398
am: 34639cbbab

Change-Id: I82cb1673fc8a066d5101bde8ae26d97ce781e253