| commit | 2e5499c42465350d3c904da29da588bf536f99be | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Sep 10 22:31:42 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Sep 10 22:31:42 2013 -0700 |
| tree | 3182cc6492ada9323745db3ce905d43afe0950de | |
| parent | 14c091109c28645e1f6cd116d9f1b4d61821dc7f [diff] | |
| parent | 8f65a294aa83d78c7f04a69227ac61f070a381f4 [diff] |
resolved conflicts for merge of 8f65a294 to klp-dev-plus-aosp Change-Id: Ifa8f1e1ec8389d4e76f4763bbfb79208fb89158d