| commit | 7c8c79dfd34200c5823a76acdb4f37128b822791 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:51:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 14:51:06 2012 -0700 |
| tree | ecc3e2d0015a86a51d787044defb13b885d21965 | |
| parent | 958959412650a78fc9a50ab4e2763cccfada8ab8 [diff] | |
| parent | 0c19ef3df1e47accc7534a1d40e55b7df8725441 [diff] |
am 0c19ef3d: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '0c19ef3df1e47accc7534a1d40e55b7df8725441':