| commit | 06ef81bd707020d579aae980ca30b5f954d9219a | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Sep 12 11:51:34 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Thu Sep 12 11:51:34 2013 -0700 |
| tree | 3837bd4abc50e09ca69be34069fa730227574db1 | |
| parent | 7c4f236532692b847b9b103df6490549656ae993 [diff] | |
| parent | 1852eb4feba27e5ee080f44fd13a39938d511fc3 [diff] |
resolved conflicts for merge of 1852eb4f to klp-dev-plus-aosp Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e