| commit | cdf3455c502891683eaa242a14e413ff947dabe3 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Aug 12 10:44:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 12 10:44:44 2013 -0700 |
| tree | eea5794db716c0d68886e508e8515ed470edab2b | |
| parent | 7466b998e6091b4857372611c66b6eca2b9324fb [diff] | |
| parent | 6dd38cc5343106251c8d66ab11bb93550082e594 [diff] |
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 '6dd38cc5343106251c8d66ab11bb93550082e594': Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."