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