| commit | 3304ba5804188da90fb015e6f5ced14010d4552e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:27:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:27:25 2012 -0700 |
| tree | a3225f860018fe2e45fb74efab5605ab00eeb65f | |
| parent | 3f24449b5c792b88c55be8c9b9e5b9ea70c06ad7 [diff] | |
| parent | 1205123e40fa563ba42c953294a291bba3f62820 [diff] |
am 1205123e: (-s ours) am 4e8ba13e: (-s ours) Reconcile with jb-dev - do not merge * commit '1205123e40fa563ba42c953294a291bba3f62820':