tree 27b0f5ae411df7453f6b2e0dad39ec8dc8a9fbda
parent 7951c459aefeb012638477b762e19b792ecbe009
parent ae760511d866888baffdd456721b84fd95328098
author Jean-Baptiste Queru <jbq@google.com> 1348591029 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1348591031 -0700

Merge into jb-mr1-dev

Change-Id: Ic72c475635a0eb57a77d3bd621a219001af8baa5