tree 88bfa3bb935128d6ab4be8598fbab7524e933103
parent df0975bba56dbf99d4306e37fcda5b640019c474
parent fb052cc3c0caf5f2eb63a25d30aef9b3157f847d
author Wei Jia <wjia@google.com> 1523473694 -0700
committer android-build-merger <android-build-merger@google.com> 1523473694 -0700

Merge "BufferingParams: add annotation @TestApi" into pi-dev
am: fb052cc3c0

Change-Id: I292beb9a2e88c2ca680412002e82ec4426ec9cf6