tree 2e96f5c43c2edc0e3b7bd38bb1d327a94f4b1cbe
parent 14a973e351171e004217829c617be4390ef54085
parent 9bc711585e0711a57b4e043c0ecbc892ce1e17ee
author Jean-Baptiste Queru <jbq@google.com> 1363034664 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034664 -0700

am 9bc71158: am f9ad69f4: am 803b245e: (-s ours) am 469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9bc711585e0711a57b4e043c0ecbc892ce1e17ee':