| commit | 563dc542d844c219c3deb906f5c369b5e0b198b1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 16:41:16 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 03 16:41:16 2012 -0800 |
| tree | c93f589bfd5a22b9c5ce550b3c4edbc70b208e96 | |
| parent | 6a6f51ff41e2d4f26bcfe0142379e70108f40642 [diff] | |
| parent | b89f1ec20b05675a0e70f9bfb6aa4a703e4597f1 [diff] |
am b89f1ec2: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'b89f1ec20b05675a0e70f9bfb6aa4a703e4597f1':