tree 648ffeb0eca93f4a04b9f56de60daee0e81b0cca
parent bf914699d5e24c1eeccd4f687eaa18b84ad1940d
parent 142fc425c472eb7a948c0eed37aa7b4b80740a8c
author Philip P. Moltmann <moltmann@google.com> 1465504998 +0000
committer android-build-merger <android-build-merger@google.com> 1465504998 +0000

Merge \"Cache resources needed to sort media sizes.\" into nyc-dev
am: 142fc425c4

Change-Id: I368ffa5269029801ed191351fb1fff9bde72778a