tree 4f768055cd7b484f8cf17c6bf881ea7afc485cbf
parent d933d688359f9166a8ab1204928b4f8981573f8c
parent dcbf996d338c5b5ed3d3936c56fad00a7beefcd9
author The Android Open Source Project <initial-contribution@android.com> 1355255816 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355255816 -0800

am dcbf996d: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'dcbf996d338c5b5ed3d3936c56fad00a7beefcd9':