| commit | 35e40ae207f0eb0a5b388bbf250a5d50de3e22c1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:28:02 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:28:02 2012 -0700 |
| tree | 24356296f845d06c2014e606b7fd1b0ff54a522d | |
| parent | 08775c22c4473f47a3b182281e3c8e3a939255f7 [diff] | |
| parent | 46955bf254419883983e252482ff54df41aa7a40 [diff] |
am 46955bf2: (-s ours) Reconcile with jb-dev - do not merge * commit '46955bf254419883983e252482ff54df41aa7a40':