tree f8ab34451805ae6745f0dce4ab10b6b93ac602bb
parent 3ffe909c96735eb52b47e9804c38bc4805f0aa89
parent 2be40f767b254b25d2cb32616b3340bdd83ccf41
author Christopher Ferris <cferris@google.com> 1427941461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427941461 +0000

am 2be40f76: am 88628e2b: Merge "Discards frames for code within library."

* commit '2be40f767b254b25d2cb32616b3340bdd83ccf41':
  Discards frames for code within library.