| commit | e5ad073d2ef974e97a613316aee5218375d30143 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Mar 12 20:40:01 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Wed Mar 12 20:40:01 2014 -0700 |
| tree | a7dca96df7c4d93a60a505ab69f04c47cf127c93 | |
| parent | acccf836166353110aa80f65fdd2fef27c237aa6 [diff] | |
| parent | c76345a39629b23997ca46b6518a2f0e45384ffc [diff] |
resolved conflicts for merge of c76345a3 to klp-dev-plus-aosp Change-Id: I54e14e1c6cd53cd10b38b34cf31989a2aa487b83