| commit | 5d790095eba79000f04216e5ab039f3040c2a162 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 24 10:13:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:13:04 2012 -0700 |
| tree | 2899c545fb49846316e84accbea99c1722ad399e | |
| parent | 38b8d0e5610e034d10a6670a0ac41e0d9c0271d4 [diff] | |
| parent | e6ce589266deddd541fe728a13dc97d661a7c121 [diff] |
am e6ce5892: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e6ce589266deddd541fe728a13dc97d661a7c121':