tree 51ce94dd8bd15d748b9c14af27eff23729accbff
parent 4b3ee2666cdddbace5b7115853780e1d969c2776
parent dc91dafa3b614b399074a1506ba1684c89ae4eae
author Stephen Hines <srhines@google.com> 1443678114 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443678114 +0000

am dc91dafa: Merge "Ignore explicit infinite recursion."

* commit 'dc91dafa3b614b399074a1506ba1684c89ae4eae':
  Ignore explicit infinite recursion.