| commit | c8167111d57992b8ce3ca554a9499973c55aa174 | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Thu Apr 03 19:59:27 2014 -0400 |
| committer | Paul Jensen <pauljensen@google.com> | Thu Apr 03 19:59:27 2014 -0400 |
| tree | e180dd6db5e8e1fe56833f361134a15fab18f8c8 | |
| parent | c48efe35885c203e0d40abc81ae40579178ab90e [diff] | |
| parent | 804b95e5356a9fbb075c528fb781dd99a3be7277 [diff] |
resolved conflicts for merge of 804b95e5 to klp-modular-dev-plus-aosp Change-Id: I124e9342acdb0c9cf0cdcae31f063787c96ab6e2