| commit | 5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 11:26:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 11:26:33 2012 -0700 |
| tree | c2351e30a2862752557eef3cff3513c070588c86 | |
| parent | ff46ccfa5cf1e16d280843c31a4d0b95ed700d96 [diff] | |
| parent | 834ce287666bf5809dc5be5c4b2a481f21fa7901 [diff] |
am 834ce287: resolved conflicts for merge of 0f2c53e4 to jb-mr1-dev-plus-aosp * commit '834ce287666bf5809dc5be5c4b2a481f21fa7901': Distributables for JZO54K for maguro