| commit | 20d1a0f7fee596f47d51e0f4c82a85f9e76c8561 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:18:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 05 08:18:19 2012 -0700 |
| tree | 99a9281a6a3f9dc7e846cec5910c943113c73ad1 | |
| parent | 6b1ac2588af1a65360391db8be266a1e27f6fb72 [diff] | |
| parent | 1f9debfe9c23b1fc4c5f9ddb34d646e434759944 [diff] |
am 1f9debfe: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1f9debfe9c23b1fc4c5f9ddb34d646e434759944': JOP05 JOP04C JOP04B