| commit | 7466b998e6091b4857372611c66b6eca2b9324fb | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Aug 12 10:14:03 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 12 10:14:03 2013 -0700 |
| tree | d45743772ccf834b369d8eceea752fdcc5703943 | |
| parent | 94c529b8d1119a452227238d54dcad86216478e7 [diff] | |
| parent | ebcee19783c4fe5ba776353e95974383850a4685 [diff] |
am ebcee197: Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later. * commit 'ebcee19783c4fe5ba776353e95974383850a4685': Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later.