tree 9561b531cee107b9b4ed3f75abdaaaaf04d6e1a8
parent ddf2040c2d12d5c1984363aff8ad24744f82b6e7
parent 669c382344b3eb8120d64d3ba6d04cf1b45bc8f5
author Jean-Baptiste Queru <jbq@google.com> 1361916480 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361916480 -0800

am 669c3823: am 4aed7b07: Reconcile with jb-mr1-release - do not merge

* commit '669c382344b3eb8120d64d3ba6d04cf1b45bc8f5':