tree d3260bb7052f1c90506fa13a975ec2d716ffead5
parent c442d2cab145461b10e15b3362735719f80cfba4
parent b7bfd5dcf8eb86a2ee83682ef1f588c50dead356
author Nicholas Sauer <nicksauer@google.com> 1414714593 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414714593 +0000

am b7bfd5dc: am fe5e4f8e: am c176cac4: ABI Related bug fixes

* commit 'b7bfd5dcf8eb86a2ee83682ef1f588c50dead356':
  ABI Related bug fixes