| commit | f978f16e50374681b0ade2d14a5e39cedaea6c2f | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Mar 11 16:39:13 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue Mar 11 16:39:13 2014 -0700 |
| tree | 99fc859d828deff24767e2cfb1f92293adc78f4d | |
| parent | a54f852d3df7ac2e245ccffe8409b217330e5092 [diff] | |
| parent | c76345a39629b23997ca46b6518a2f0e45384ffc [diff] |
resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8