| commit | 47bc49d6d40997ba853c6a4e88101ae56ba288c8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 11 11:56:56 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 11 11:56:56 2012 -0800 |
| tree | 4f768055cd7b484f8cf17c6bf881ea7afc485cbf | |
| parent | d933d688359f9166a8ab1204928b4f8981573f8c [diff] | |
| parent | dcbf996d338c5b5ed3d3936c56fad00a7beefcd9 [diff] |
am dcbf996d: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'dcbf996d338c5b5ed3d3936c56fad00a7beefcd9':