tree 6a30ae82fdd2f126666518e97d3bb1b0786e4155
parent 1c1e54c3f4aabec1d111eba44d87e1bd06f4940b
parent 8bb850ab4c6d7c57a0a9e77d33e00f43a8876b76
author Jean-Baptiste Queru <jbq@google.com> 1348867298 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1348867301 -0700

Merge from jb-mr1-aah-dev

Change-Id: I690b2e7bf9a06fa53fd6fc922f619b6a0020d158