| commit | b45b39a2630e58d2c546d971cc0ff8f903057329 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Aug 12 10:46:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 12 10:46:33 2013 -0700 |
| tree | 6f59027499de3b89add6dfd870eb1ee5222cde45 | |
| parent | fefff422556b6ce552431f368182c4833bcd201a [diff] | |
| parent | cdf3455c502891683eaa242a14e413ff947dabe3 [diff] |
am cdf3455c: am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later." * commit 'cdf3455c502891683eaa242a14e413ff947dabe3': Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."