| commit | e72aca6d93e498b0f403672127774e1cce8d0768 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:24:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:24:40 2012 -0700 |
| tree | db6301ecf8a8cec002b0f2a8ad171e02e6521516 | |
| parent | 4b40143385bf3f1fbbeff0c355664e9c4da34c75 [diff] | |
| parent | 449a7d0d78ceb71e478e77ac4d339272dee78c1b [diff] |
am 449a7d0d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '449a7d0d78ceb71e478e77ac4d339272dee78c1b':