commit | 5a0bb29cbc767530b940b1776d1363de8aeba1c3 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:49 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:49 2013 -0700 |
tree | cf7a910992a39ffb6045b2f84ac5ae1ad5050256 | |
parent | 7f6968fb3ac8fc14036428b7dfca1c26fc42d5a8 [diff] | |
parent | cfc09248d393baf1214d338a0b004a23869d3bee [diff] |
am cfc09248: (-s ours) am 07f11e34: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'cfc09248d393baf1214d338a0b004a23869d3bee':