| commit | 75b44962d87598597314ce028aaf0914a0a5f9f1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:42:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:42:06 2013 -0700 |
| tree | 4da76af1a81570a822e83765ef45291f158876d1 | |
| parent | 1d21f7344157c4d0b1730faede5cf19e7253939f [diff] | |
| parent | 16106266fd56bbdb71a2fed1a29a00d24e6e9683 [diff] |
am 16106266: (-s ours) am 59e2edb3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '16106266fd56bbdb71a2fed1a29a00d24e6e9683':