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