| commit | 869a28537ca5a640f8d1ae6df3e4051f4f9fb5ac | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 27 08:24:58 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 08:24:58 2012 -0800 |
| tree | a311f0a5bdea0e196382aaa9be7d4287c129a90c | |
| parent | f291ad46ebab58a9254bdd13c0e5dd581c197e6b [diff] | |
| parent | ba2c0087fbe17c7f247ada75828185e8eab7325e [diff] |
am ba2c0087: (-s ours) am a6caaa2e: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge * commit 'ba2c0087fbe17c7f247ada75828185e8eab7325e':