| commit | 928d570c7f2496dd4b1798f51cf79ce1427cd611 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 03 07:40:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 07:40:20 2012 -0700 |
| tree | a416827eb72ed0940b8d99510d350260ebe706c8 | |
| parent | 2bd719692c88074a8a01df4fe9f3b3ab81197e8d [diff] | |
| parent | 4a1a8c6ae738e7aefc67327ddcf87be5df072e5d [diff] |
am 4a1a8c6a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4a1a8c6ae738e7aefc67327ddcf87be5df072e5d':