| commit | 4f67c7515b79e62d2fc33233cf5a4e2b6d21fc7f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 11 11:57:03 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 11 11:57:03 2012 -0800 |
| tree | 9bc900ba51fb0099160983ff70e758d1bc3d7112 | |
| parent | 03cb98aecfeef0b0894f69987f8b4a15c02501f3 [diff] | |
| parent | 6c0ad7a0644a393e3a89a35fbd80e8f86458585c [diff] |
am 6c0ad7a0: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '6c0ad7a0644a393e3a89a35fbd80e8f86458585c':