| commit | 65102c394d1b3bb8915e2a391b78775d8bbc7b6d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:55 2013 -0700 |
| tree | 26b6251d2830aa28d9e31410f4c856623555b7d6 | |
| parent | c5a129e11702e2878b3f17be1cfb27e841f7b9ce [diff] | |
| parent | 4721099487857d9fb02c6c3ad9e540f6526afa00 [diff] |
am 47210994: (-s ours) am c2f34af0: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4721099487857d9fb02c6c3ad9e540f6526afa00':