tree b021f65b4d08a79a72b66c720026aa8f37109279
parent 8e1a87b5470d0708b0503c3a33580e1782e2bda2
parent a9a1d8a5d2b5969b63e8012e1c0be9c53a546cc5
author Jean-Baptiste Queru <jbq@google.com> 1348867793 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1348867796 -0700

Merge from jb-mr1-aah-dev

Change-Id: I56ae94f8efe9eecedc17da2f573e8fde2b80d151