tree 3a2dc36bc6652f9592fa077aba710bfc41767511
parent 3bbdccc7743a3a7343ad3cc68d37508cab185d0d
parent 4c38e93e2067c8a0219865c0d5a10f5a66809d8c
author JP Abgrall <jpa@google.com> 1442940422 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442940422 +0000

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

* commit '4c38e93e2067c8a0219865c0d5a10f5a66809d8c':