am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev

* commit '4c38e93e2067c8a0219865c0d5a10f5a66809d8c':
This commit is contained in:
JP Abgrall
2015-09-22 16:47:02 +00:00
committed by Android Git Automerger

Diff Content Not Available