| commit | 06db73241a12a6b5f352647e966d254ae6443f68 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue May 27 12:21:22 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Tue May 27 12:21:22 2014 +0100 |
| tree | c6d29522ec3549a7cf201605cd595c882d746176 | |
| parent | bcdbb68a9b0466136af0b4c9d5b46d4b6343cc2d [diff] | |
| parent | 0f99bb3d0bb358e79be85b54823792ec2c198b8b [diff] |
resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f