tree df81a23b1958e9b49a270fc291bba8fb32db1d88
parent 743539acfdd452bba0f0b4117a4daf9824bb13df
parent fcd9565ec520e83ddabb9f3c99c10e19e2bc764c
author Daniel Nishi <dhnishi@google.com> 1507062669 +0000
committer android-build-merger <android-build-merger@google.com> 1507062669 +0000

Merge "Fix a cache calculation regression." into oc-mr1-dev
am: fcd9565ec5

Change-Id: If0d8f5a0e54a71899c2f878c61747223579bf24a