| commit | 3a6efcb8ce5098a2817ac85a099ca23d4e2c8b47 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 11 11:57:07 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 11 11:57:07 2012 -0800 |
| tree | 07a99dcb8fb1c21b0995f991f479859f25f39bd8 | |
| parent | 0e1e53e376ccb3c173ff8e5efeab39b2c5dfd6bd [diff] | |
| parent | 0c6fff72f78e4f80b28ccccac9584255591dd1a2 [diff] |
am 0c6fff72: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '0c6fff72f78e4f80b28ccccac9584255591dd1a2':