tree 82b5f2b173419334be5bfd81401f159593bae78f
parent 07ebe49da17282f86caa0ca2bad10beea6f96bca
parent 5b9c2c2a4df1995d47ae645dc5779d250184b1b0
author Jean-Baptiste Queru <jbq@google.com> 1348867613 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1348867646 -0700

Merge from jb-mr1-aah-dev

Change-Id: I6a61b2bf73759cecf94d379e2a5e7ce102593c04