| commit | 98ac6c79a430e62a886b3a8278694425b5906300 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jan 31 12:08:17 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Fri Jan 31 12:08:17 2014 +0000 |
| tree | 7258fdc1a9489c0130b82d54d80f9ad1ce5f24b8 | |
| parent | 643be3bab19a6305e776721854b293928bf2bfaa [diff] | |
| parent | cb7cdd5053ab37e3b606eb313e8b482a2047091a [diff] |
resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b