| commit | 8c9ca6491b5819b5304b42186f5f0fff7e5eb156 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 15:47:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:47:51 2012 -0800 |
| tree | c1d4ffb788dc3f81482a1ff15fcba1afc998cfad | |
| parent | 760e37539ff075461e71cdb913b19853ac1a3589 [diff] | |
| parent | 36f9ca38266580c7bdac9c83a03a2b60daddf3a9 [diff] |
am 36f9ca38: am 17e06817: Reconcile with jb-mr1-release - do not merge * commit '36f9ca38266580c7bdac9c83a03a2b60daddf3a9': JOP39