| commit | 2e7a8b44c2691770e917efcca80bc2650d93efaa | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Tue Sep 10 19:49:04 2013 -0700 |
| committer | Christopher Ferris <cferris@google.com> | Tue Sep 10 19:49:04 2013 -0700 |
| tree | 8337c18451366451d39aee09b6c9509e4a34437f | |
| parent | 5cb04369309856f2d2960fe3fbd517ce4e403605 [diff] | |
| parent | 883ef2499c2ff76605f73b1240f719ca6282e554 [diff] |
resolved conflicts for merge of 883ef249 to klp-dev-plus-aosp Change-Id: I1e2bd03a0cb5a0ab191c525d1574377bc7fd90ab