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

* commit '62f63c54ce697a26f2a03c952818e5a7ec8e5fea':
  PipelineCache: track buffer allocation

Change-Id: I35296ff565b486f945cc53246c87af0a51e74d60


Trivial merge