tree dbe1bd60449a52bc1758ed038d37bab7eeeac6b3
parent 01880c02f5200e2faad1459fb8531dfeb5cf38cb
parent 946334b3d3f5cd0390f35022217cec95338dd01f
author Yura <yura@google.com> 1392411291 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411291 +0000

am 946334b3: am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit

* commit '946334b3d3f5cd0390f35022217cec95338dd01f':
  Moved paddingStart to -v17 folder.