| commit | 63cc80ff010b8bdac107da9cdd1e32b72ca602f7 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:27:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:27:38 2013 -0700 |
| tree | 63f5fd378c80fc9f7c33353cc9b128617229bae8 | |
| parent | 7819abd2d191a170cbc9d4bd190001c465187a9d [diff] | |
| parent | 1419f206d29c3357f56edda72354d7d305fee974 [diff] |
am 1419f206: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1419f206d29c3357f56edda72354d7d305fee974':