| commit | 1160ab645e4f74bc8959cb1160e8d375f41d1bcc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:52:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 07:52:29 2012 -0700 |
| tree | b4a887351cfe32c06b5be9516f16a83a568f26f9 | |
| parent | d4631ebbdaad8e2174ad7a281e7e46fb8cd03946 [diff] | |
| parent | cdda076b835301cc0d21ca1095ea607d44f52b3c [diff] |
am cdda076b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'cdda076b835301cc0d21ca1095ea607d44f52b3c':