| commit | 813ff58aba8cfdfd84a41c15693515c4598fd9bb | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Tue Nov 05 16:49:03 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 16:49:03 2013 -0800 |
| tree | 794cd1043e3547c4b1a9abd3c400c65790b6b338 | |
| parent | 146c90edaaf9517d361648fb410eb5b6527599b7 [diff] | |
| parent | 4ef4d898f6adc1b8dbabc4178b981567d6f377b2 [diff] |
am 4ef4d898: resolved conflicts for merge of 790f9183 to klp-ub-dev * commit '4ef4d898f6adc1b8dbabc4178b981567d6f377b2':