tree 8b0845810159cdc1cd6d5e5f338f1e5ccd0638a5
parent 5243f8644fb4ae67a84df877b585ba4d75d0a733
parent 61ea9d98c8e90e18de8612977daa110bf06907e8
author Jean-Baptiste Queru <jbq@google.com> 1361917629 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361917629 -0800

am 61ea9d98: Reconcile with jb-mr1-release - do not merge

* commit '61ea9d98c8e90e18de8612977daa110bf06907e8':