| commit | 4520cde4546ce4a442c7438580f41983baba9e28 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:31:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:31:15 2012 -0700 |
| tree | d29481976f897e189b29ce68e039faf19e199662 | |
| parent | e150727be4c176ad7e5da6fef9704e4283ae49ee [diff] | |
| parent | 56b4a040ff044761268dbeaa2407ebbcf100cb69 [diff] |
am 56b4a040: (-s ours) Reconcile with jb-dev - do not merge * commit '56b4a040ff044761268dbeaa2407ebbcf100cb69':