| commit | 89c4631e569cb3ef8b6523f5da10bf49da967666 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 09:12:03 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 09:12:03 2012 -0700 |
| tree | 4b507e25a71c842ad48ee2ed0ae39aa866624f58 | |
| parent | 7a56f99e7467bad3dfd81ad935de3271b2f772e4 [diff] | |
| parent | b74cdde67616e214d6bb90212e7dcb62b7b28361 [diff] |
am b74cdde6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b74cdde67616e214d6bb90212e7dcb62b7b28361':