tree 049581dd68043a1b848cf6381d5b2c957a2f0f6c
parent 9e717923f8f7fc3c88a37603dd298dbd742cb2e9
parent d65b23089c90edcf2808ccccf8f918b6155cc2ec
author Michael Jurka <mikejurka@google.com> 1335902640 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335902640 -0700

am d65b2308: Merge "Use public API to get padding" into jb-dev

* commit 'd65b23089c90edcf2808ccccf8f918b6155cc2ec':
  Use public API to get padding