tree 8cdc339188c11947bb832a67ee2f176e75ec16cf
parent 387fff03cb75286a9f008a3400821ed8da7868b8
parent 9187e7e2b11ca7c118f9dcb1818804bc19cfd1d3
author Chris Craik <ccraik@google.com> 1515610814 +0000
committer android-build-merger <android-build-merger@google.com> 1515610814 +0000

Merge "Fix placeholder-disabled tile loading" into oc-mr1-support-27.0-dev
am: 9187e7e2b1

Change-Id: I55a43c3b30869017bdcb7a7d31ffc3ae05a093da