| commit | f9344c0eeacad791fe10a5d1ffc05de2187bf0c6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 15:14:28 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 15:14:28 2012 -0700 |
| tree | c390998640286ff3abaae6a60dccb0860a8af25e | |
| parent | 2c12dfe5ad1738e7b5fe950f41b2b66e35760380 [diff] | |
| parent | 5a6f9b19b8312b8044fb2ec288dc7839a937d87f [diff] |
am 5a6f9b19: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '5a6f9b19b8312b8044fb2ec288dc7839a937d87f':