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)
commitaab7ab53cb96b3dda43699799b8d953636c6f599
treea6e4155c8e8dd521009a5c7a20741ec6d814fb38
parent6a70175acc26dbfb0206a7c8afc61bc89c57697b
parent62f63c54ce697a26f2a03c952818e5a7ec8e5fea
Merge "Merge "PipelineCache: track buffer allocation" into nyc-dev am: 0eae982184 am: 354f210248" into nyc-mr1-dev-plus-aosp
am: 62f63c54ce

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

Change-Id: I35296ff565b486f945cc53246c87af0a51e74d60