tree c8be10a94e1ec7b66b51b71045701cb48c5b07ca
parent b89526a43d2150f9af682fe1010814cba262546a
parent 9ccec215ea7edaecfb0b8f248f0777aea4fce424
author Christopher Ferris <cferris@google.com> 1427943593 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427943593 +0000

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

* commit '001ca70933d803264b97283f59aa0baf4abe35b2':
  Discards frames for code within library.