| commit | 355ac7ba6634755553f607c6cce0fb623bea5519 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:18:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 05 08:18:23 2012 -0700 |
| tree | 3739b9f9114cc9d1675169d972bcd9793de0341e | |
| parent | b54d4683095dce8658f1cbf4cdfaa03609018e11 [diff] | |
| parent | 8e819b27dcff60f388e0aabeb2a100a4cd07d31d [diff] |
am 8e819b27: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8e819b27dcff60f388e0aabeb2a100a4cd07d31d':