| commit | a6e95f450334c60855d3bcf9cf2282260ab5ec6b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 22:44:36 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 09 22:44:36 2012 -0800 |
| tree | f76bace44e9431782f94c70d579786f6b08d5796 | |
| parent | 60a34ed5011efe7796173a1a63c13d28ae7878fa [diff] | |
| parent | 2c76626789453bb9734ced4b5aab318260bff795 [diff] |
am 2c766267: (-s ours) am 976a70c4: am 5194366b: Reconcile with jb-mr1-release - do not merge * commit '2c76626789453bb9734ced4b5aab318260bff795': JOP40