tree 894ac3066bbbdd43965c723e2207c29d3d743c26
parent 8f3ad008876ab7263606bda6c441ed5bc8e940a6
parent f6b7171edf6f89264ea58af0e9b21fdb419d6feb
author Jean-Baptiste Queru <jbq@google.com> 1344967695 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344967695 -0700

am f6b7171e: am 270a609e: Merge "Add telephony intermediates to classpath"

* commit 'f6b7171edf6f89264ea58af0e9b21fdb419d6feb':
  Add telephony intermediates to classpath