| commit | f68def35347fc9dc997216932ce9e5ebfe026b54 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:21:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 15:21:27 2012 -0800 |
| tree | 4340d5f28d72147dcd5002fdbffcef9c8de8e860 | |
| parent | 7fb315b27db55f86eccb19cd4ddcf4b850be1b5e [diff] | |
| parent | 407d15d0d16ce015630beb4f622a3fd317b5364b [diff] |
am 407d15d0: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '407d15d0d16ce015630beb4f622a3fd317b5364b':