| commit | 598f3e9c4a48a4f4cbae6fb163f378d9fd1e6321 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Aug 09 01:05:48 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 09 01:05:49 2013 +0000 |
| tree | 032a162a2248b2fc0be232afc9b9666747a1e5dd | |
| parent | 14ec1b58869362f07ffdf7495cbba2f746da7b77 [diff] | |
| parent | 3c3a64616a7d37183ac008516afad4dd93b9f562 [diff] |
Merge "resolved conflicts for merge of dce94165 to klp-dev-plus-aosp" into klp-dev-plus-aosp