| commit | 4577088501808032d8337fc54dc1c74525a11240 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 02 07:30:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 02 07:30:23 2012 -0700 |
| tree | 4ab4ff62d3d9876cd3d5a0113a174a156421aa7f | |
| parent | 008c5932feb735e2a498a4245798f5d1b44c4194 [diff] | |
| parent | d407906bafcbdd0e6a8ac8b8e6a93d30fcb162d3 [diff] |
am d407906b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd407906bafcbdd0e6a8ac8b8e6a93d30fcb162d3':