| commit | d15e80d6e2c32d4342e9e0b0d05305032f19c51a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 16:48:52 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 14 16:48:52 2012 -0800 |
| tree | 6015501e538a2865cf88c27fcc29d4511adbc3d6 | |
| parent | 8c15e91344a5e97ca069200070745c4384f40750 [diff] | |
| parent | 1b770503394da4968fdabf5c39190edf60031f59 [diff] |
am 1b770503: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '1b770503394da4968fdabf5c39190edf60031f59':