commit | 72ce769beae22c012d92240d5e18afe7f7cffee4 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 28 17:12:59 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 17:12:59 2012 -0700 |
tree | 0df2a63a85b98496d7edf8b9963c070c22c53559 | |
parent | 2326a37e5564e644d3046ac14398f2c6a1ac697f [diff] | |
parent | 60ebd88c6a8e66eb59f9de5fcf5a52d164fb406d [diff] |
am 60ebd88c: Merge from jb-mr1-aah-dev * commit '60ebd88c6a8e66eb59f9de5fcf5a52d164fb406d':