| commit | b4fed67e6654a0cc6ae28ed33cac85ddbc5d1e92 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:40:11 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:40:11 2012 -0800 |
| tree | d708a0f0d49c62de4ec342904b31173d3a26fc6c | |
| parent | 0572d72cf787e9f3d0d60c6f2198501a8ca2f238 [diff] | |
| parent | ac022d9229eec51acbd04878067eba0c705e427d [diff] |
am ac022d92: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'ac022d9229eec51acbd04878067eba0c705e427d':