tree 13b9c170433f70f846520d58b18f10104d76afb4
parent 719518bf4bc031e26954d07e30fee2cca5683fe5
parent 80db0db52bcc538c519996f19068345ed33a43af
author Jean-Baptiste Queru <jbq@google.com> 1363030471 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030471 -0700

am 80db0db5: am 8b40761a: (-s ours) am 35cf1243: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '80db0db52bcc538c519996f19068345ed33a43af':