| commit | 5c8cff772f65cd6befaf73dd2b6f179082818589 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 20 16:41:58 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 20 16:41:58 2013 +0000 |
| tree | 1c75d2625fb18d25a771c16d4bd94f221a149857 | |
| parent | b178fbe67bc532519242cfec0a9f5190878daef0 [diff] | |
| parent | 3c7eb2a2ba1f97814d39c23e6dea0afa7ff92240 [diff] |
am 3c7eb2a2: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '3c7eb2a2ba1f97814d39c23e6dea0afa7ff92240':