| commit | a879ae65aa411b0537833663ce4c2923bae572fd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:21:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:21:25 2012 -0700 |
| tree | aee8594b43800f6d56f8b5f78062fced5af5b5a7 | |
| parent | bff680aeadbc89afb45baec83ff414ebeb80c1f0 [diff] | |
| parent | 50926ed43509b7d16a2c4b9375f53986cc9a28b7 [diff] |
am 50926ed4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '50926ed43509b7d16a2c4b9375f53986cc9a28b7':
