tree cba62d0d64153aa2169651696bc238591341d679
parent dcb02a7b6c9f88c34852eaaee544433b7572ca4d
parent 7dae6109dbae41d7d0d8278c8646023d790693bd
author Yura <yura@google.com> 1414085565 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085565 +0000

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

* commit '7dae6109dbae41d7d0d8278c8646023d790693bd':