| commit | 18fa8e500b148dcd3620c1cde5e207813f8768a7 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Jul 12 09:36:16 2014 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Sat Jul 12 09:37:14 2014 -0700 |
| tree | 04a9dc8299f6c0b5710b40fa32bdc98c280aad87 | |
| parent | 89aaa5c1acd05b1d67b6059b39acc7739686adfc [diff] | |
| parent | 2f7c30c23d56cff63615e968de161c238ba1ad95 [diff] |
resolved conflicts for merge of 2f7c30c2 to klp-modular-dev-plus-aosp Change-Id: Iccd20a349cabd152ad9a72d77db6b8c7f0deec1a