| commit | 989bbbdddc450a8e380b5f5318bb6e38a89637ae | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Nov 13 17:50:35 2013 -0800 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Wed Nov 13 17:50:35 2013 -0800 |
| tree | 003a3971fbfff8b400c4d6e11f26bb344186199a | |
| parent | 2a1fb433e5ed5d5fd52f7018483481fc6aac9435 [diff] | |
| parent | 639aed71725750768e4c706118c9a84684109f37 [diff] |
resolved conflicts for merge of 639aed71 to klp-dev-plus-aosp Change-Id: I220a034cf3293a4a29d8683f20812adac112bddd