| commit | 29e21d40ac90eeebce3c4bed9bfb50ff179cde43 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 11 11:55:30 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 11 11:55:30 2012 -0800 |
| tree | 8de820e684b81f6cd854efb1291544f783638c4c | |
| parent | b3f0eb16b28b30d931e0d92d8c93feeb945d7f5b [diff] | |
| parent | 7c6658ea71f5aa3a3614cd2dbde123b831850e55 [diff] |
am 7c6658ea: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '7c6658ea71f5aa3a3614cd2dbde123b831850e55': JDP71B