tree 5b236dfc5c707dbe3becde4d8c9db8faa339f29a
parent 3fd60b428202a0f5f324fccc67c0c0402b9131ba
parent 3c73fdaad106c2bd5e9d9349aae13f07ec40a547
author Jean-Baptiste Queru <jbq@google.com> 1363030084 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030084 -0700

am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3c73fdaad106c2bd5e9d9349aae13f07ec40a547':