| commit | e200e86726155e2ebbf8f50b2df68e352dd9ae8a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:56:35 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 07 07:56:35 2012 -0800 |
| tree | bb9503b64d557b7ebc562f96a29116220d3a96fd | |
| parent | ef31321d42536716a30455886a85d37aed0e3e9f [diff] | |
| parent | 77b4ab2aa35a005f0d4459fd1a34db72c79427b3 [diff] |
am 77b4ab2a: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '77b4ab2aa35a005f0d4459fd1a34db72c79427b3':