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