| commit | 3c2b1975f52de3f838bdfb5543244bb8166d14cd | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Mon Nov 04 17:16:43 2013 -0800 |
| committer | Dirk Dougherty <ddougherty@google.com> | Mon Nov 04 17:17:18 2013 -0800 |
| tree | 2184980679a1d4f69f883c1516d0a87eea27ef32 | |
| parent | a5ed7e63a93ab2fe2a4b70c88c72de51abaf7841 [diff] | |
| parent | 790f9183aef321e3b0dc5396e71abf495c72b551 [diff] |
resolved conflicts for merge of 790f9183 to klp-dev-plus-aosp Change-Id: I4fa30d0198f6cb3d4c1bf748b42571c5b10b116f