| commit | 1cf9634191a2264732ef8343e00671fa5739e76a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 26 14:03:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 26 14:03:35 2013 -0700 |
| tree | c0299788496450bd423d7c1fb99251f46c6acd1f | |
| parent | 58f054cc942ad8f69163a417428b0470d6fe25a3 [diff] | |
| parent | 94cc57b366ee8af8fe45ecceb83146612b7a45f9 [diff] |
am 94cc57b3: (-s ours) am 55b33b92: (-s ours) am e3778c2d: (-s ours) am 0175ec0b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '94cc57b366ee8af8fe45ecceb83146612b7a45f9':