tree 22506c2ce7954f12ec0fd7a5571b5883892ef2ee
parent 4681e74532985ab2d69c920267428b82305f8196
parent f644f7d6348edf1327d3a792c66e9446ed143511
author Jean-Baptiste Queru <jbq@google.com> 1363033121 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363033121 -0700

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

* commit 'f644f7d6348edf1327d3a792c66e9446ed143511':