| commit | b92fd5d893548cfae71f5efda6d4f1e46004e5da | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Tue Nov 05 16:52:05 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 16:52:05 2013 -0800 |
| tree | 863d50d3f80ae6ae47f26f3586cc534500ed6c93 | |
| parent | 063cdf44f88683c8bb6fdf4938b6dad0fcafd8c7 [diff] | |
| parent | 813ff58aba8cfdfd84a41c15693515c4598fd9bb [diff] |
am 813ff58a: am 4ef4d898: resolved conflicts for merge of 790f9183 to klp-ub-dev * commit '813ff58aba8cfdfd84a41c15693515c4598fd9bb':