| commit | 60ca41ebb771a7377b7f15493bf6f54e0ceb066f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 11:04:10 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 11:04:10 2012 -0700 |
| tree | 0361a2c92a97db1c0bc0df5b630c8bb606ab153e | |
| parent | fa844eff3200c5b1e2176487891ab6ca35ad5fe8 [diff] | |
| parent | d9c2de10d94b1c46e0e3dee41bd6d8de673d2267 [diff] |
am d9c2de10: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd9c2de10d94b1c46e0e3dee41bd6d8de673d2267':