| commit | 4de4e6defce30e7693cea04e9553ee3bb1e72f88 | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Tue Oct 28 19:09:50 2014 +0000 |
| committer | Calin Juravle <calin@google.com> | Tue Oct 28 19:09:50 2014 +0000 |
| tree | 086931f00607277a29531095dde61e1750e7c7d9 | |
| parent | 845867b2c2bb373cf253dec7d771870bf2de5e0d [diff] | |
| parent | e3c22c416fb2322d1748f66e3ed2bf6f265a8c68 [diff] |
resolved conflicts for merge of e3c22c41 to stage-aosp-master Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d