| commit | a668cc4e48fb8555abbb336e464b9e7c0041609d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:57:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 14:57:16 2012 -0700 |
| tree | 851edd2206ababb07d8ebf4910dca78f2ba5ea2d | |
| parent | c5b7edf7abcc97c75afeab800dcfd3d42b802232 [diff] | |
| parent | 50ce25264492452ef2c2acd3ded3ae52e0b421e4 [diff] |
am 50ce2526: (-s ours) am 9dcfff20: am ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '50ce25264492452ef2c2acd3ded3ae52e0b421e4':