tree c680c5d98d789c75923957058126604e7041b5e8
parent 2fd43bef60b65fe63cf3d75451ae552dd7630369
parent b1ceaa328c59b6ff8ab963212586d6b6fdf9dfe9
author Jean-Baptiste Queru <jbq@google.com> 1363032050 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032050 -0700

am b1ceaa32: am 03b1a002: (-s ours) am 32c3e965: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b1ceaa328c59b6ff8ab963212586d6b6fdf9dfe9':