tree 91162331fa90838d208be5ce960f5116293c46ef
parent 0532d9835e14df910c086f7d431a7fa2d2e67120
parent 219e11ef9d25501677e51b6497ae71cea1717141
author Philip P. Moltmann <moltmann@google.com> 1465505612 +0000
committer android-build-merger <android-build-merger@google.com> 1465505612 +0000

Merge \"Merge \\\"Cache resources needed to sort media sizes.\\\" into nyc-dev am: 142fc425c4 am: c6bddb8261\" into nyc-mr1-dev-plus-aosp
am: 219e11ef9d

Change-Id: I08f41cbaa1f81d234aa04cff7d6332304b9a75bf