tree 3338dc342024194ff49fa639432596dedecf6aef
parent b2ff97c6589dd3d3c5e3da5f7c7a69b7a42fb317
parent 89b22492ee4355537bc6bb0d33c1452130dab05a
author JP Abgrall <jpa@google.com> 1436938628 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436938628 +0000

am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe

* commit '4e7386bda93c41b622c64b1ce17b7d1b8bd503fd':
  Fix CTS build