tree 68a871428d73b28421de0a41ef6440b211c40499
parent 040c13b3a5d02edf3b2d1a8a0791145f7130ae9f
parent e29b9ae47bc21bb582dd6a0fb57796c09d3c8722
author The Android Open Source Project <initial-contribution@android.com> 1368820778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368820778 -0700

am e29b9ae4: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'e29b9ae47bc21bb582dd6a0fb57796c09d3c8722':