| commit | ec463b96e188f2c68cbef2362e570118a3a460ed | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue Mar 11 21:01:49 2014 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Tue Mar 11 21:01:49 2014 -0700 |
| tree | 23e39de94339113633ca0894635a51d4ada12f1b | |
| parent | c48701a134d3ba05e35d94da921abe1120b67185 [diff] | |
| parent | cc9894c82559d63b1ae89635b0ae9965e03d598e [diff] |
resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp Change-Id: I0fa4486ed300a35de3af8748e01300b01f03ec01