tree b3d7fbc3519a0952ec2420cef04644f8a0040ef5
parent 09745436e78f698bae897e1ab8c96eebe23219ec
parent b758bbd84e6d4556376850186252777a1a239f4a
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1442858718 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1442858718 +0000

Merge "Revert of Combined approach. (patchset #2 id:20001 of https://codereview.chromium.org/1356133002/ )" into master-skia

https://skia.googlesource.com/skia/+/b758bbd84e6d4556376850186252777a1a239f4a

Change-Id: Idd5fa85d26fb751df13d8766c813d7339f435173