tree 7c8d11edf30d418cee63b3bbe61f01edb7a0b5df
parent ad2febc034ed809b6de7cfe787b44d64203e8ca9
parent 37872e8e8d04fb42606c149aad09e7433a012454
author Jean-Baptiste Queru <jbq@google.com> 1348864892 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1348864893 -0700

Merge from jb-mr1-aah-dev

Change-Id: I2980277ad6342efb6f9f7ad1b13acc8a664c08e5