tree deb2c647a1a7e29f2d85f76cc8bacb6f7db29b01
parent 9d80c98affe870ad168aa972aca4418d6f9ac776
parent 1d8b17ac6e9c92c79d8e33e4d89b8e75f4a3e347
author Yohann Roussel <yroussel@google.com> 1432202526 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432202526 +0000

am 1d8b17ac: (-s ours) am 2db531ee: (-s ours) Merge "[DO NOT MERGE] Allow compilation with Jack."

* commit '1d8b17ac6e9c92c79d8e33e4d89b8e75f4a3e347':
  [DO NOT MERGE] Allow compilation with Jack.