commit | ff46ccfa5cf1e16d280843c31a4d0b95ed700d96 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 28 15:52:08 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 15:52:08 2012 -0700 |
tree | 6a30ae82fdd2f126666518e97d3bb1b0786e4155 | |
parent | bb5e72a0e3e05a546113220b073f5662f25feb61 [diff] | |
parent | bf5faacaebf3e6e87181b3a65f1b8a60976eb6d6 [diff] |
am bf5faaca: Merge from jb-mr1-aah-dev * commit 'bf5faacaebf3e6e87181b3a65f1b8a60976eb6d6':