| commit | 1b753cc96f2ddd8289909ae46f43e9333ab1af47 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Wed Nov 06 15:55:12 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 15:55:12 2013 -0800 |
| tree | 723920adcf75c375e50e340f2064aed496670eb4 | |
| parent | 4899398dcad50d1b9734ca5f8959712f42f72b02 [diff] | |
| parent | 1ae704b87efbcae9aff46776e27e72678f92ce42 [diff] |
am 1ae704b8: resolved conflicts for merge of b08447ba to klp-ub-dev * commit '1ae704b87efbcae9aff46776e27e72678f92ce42':