tree 34049eab3dcc3b498de99ec186881bbaff483824
parent e0c8f22188026985f304bc28da6fb41d3bffb517
parent 9576bbd3ebe93050c32c21e928dcf23ccc9c97ca
author Jean-Baptiste Queru <jbq@google.com> 1363030909 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030909 -0700

am 9576bbd3: (-s ours) am 810a7295: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9576bbd3ebe93050c32c21e928dcf23ccc9c97ca':