tree cd02701ab8db1490a307a6e465a09f58cc08e429
parent c26df762c64a892b944612f67197df90b2fcae14
parent e168449b32399e43cdb9cb918dd1772b29b02606
author Hall Liu <hallliu@google.com> 1502927985 +0000
committer android-build-merger <android-build-merger@google.com> 1502927985 +0000

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

Change-Id: Idc7b2897dc4a1bda38455d6fade54153770d176f