| commit | 27d23cd99fcabf111002af3b07752753325bbc64 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:32:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 08:32:33 2012 -0700 |
| tree | 5a86d7a8720a9ad79fb395b04d54385fb5b19ef9 | |
| parent | 8830283f3c8289800368b840324d608fbad9981f [diff] | |
| parent | 2d85ca3c91d43a7192363b24cf99eac60c7a7904 [diff] |
am 2d85ca3c: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2d85ca3c91d43a7192363b24cf99eac60c7a7904':