Merge "Merge "PipelineCache: track buffer allocation" into nyc-dev am: 0eae982184...
authorPyry Haulos <phaulos@google.com>
Tue, 17 May 2016 16:16:18 +0000 (16:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 May 2016 16:16:18 +0000 (16:16 +0000)
am: a5bd7e6bdd

* commit 'a5bd7e6bddd8f08ca97b4564ff610fcc2df89cc9':

Change-Id: I55e4645f97a671ba82962f4b377ff3572f5fd191


Trivial merge