tree f0a5dd6cf8d00e71291fa284cd13ecfb45f33c60
parent 22dfc2b2cb21b56e893be494b664e3f4fc85d1b7
parent 023dddfb4dd995dc8874a3667d42f728fa460e30
author Jean-Baptiste Queru <jbq@google.com> 1361918600 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1361918600 +0000

am 023dddfb: am 7e0bd69e: am 12b61826: am 61ea9d98: Reconcile with jb-mr1-release - do not merge

* commit '023dddfb4dd995dc8874a3667d42f728fa460e30':