commit | daa3e04e485a037b38ff0d97a04fb1e0d139b143 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 12 07:28:31 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 07:28:31 2012 -0800 |
tree | 52610baba474df56aca468336f7da3b89a91b645 | |
parent | 976a70c41ec0dd6f283c1bec8b2c0c15deb373c0 [diff] | |
parent | 2e939805afafebced02bc3ed027807291ddd5dc4 [diff] |
am 2e939805: Reconcile with jb-mr1-release - do not merge * commit '2e939805afafebced02bc3ed027807291ddd5dc4': JOP40C JOP40B