tree 53bccb4964a3d3b1063237b5b10eeb80eb1b6d2d
parent dbda1c852d68fde2e729ff2f8e85a406da73994b
parent 1abb9facbbc91c8df629d9b740002d749bc5c2bc
author Jean-Baptiste Queru <jbq@google.com> 1363034662 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034662 -0700

am c5604b08: am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c5604b081b6cac558ed94dce88dedf1a467185b7':