OSDN Git Service

Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
authorEino-Ville Talvala <etalvala@google.com>
Mon, 12 Sep 2016 19:26:40 +0000 (19:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Sep 2016 19:26:40 +0000 (19:26 +0000)
commit885c6de35890ac72f60e272b02b0b6c0c016b61c
tree57fef32c31a8132899d45ad377c22415352d0be7
parentad0fbe061223753af58a3dc08693a204e789bfb3
parente93c6550931e2d6114b52b264ed1806683175187
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
am: e93c655093  -s ours

Change-Id: I9652b84387a9edaf628c00bae3efa4020292d6f2