| commit | 6f7447f377aa79bf2bcf22f41535b142d8b33529 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Jul 12 14:57:39 2014 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Sat Jul 12 14:57:39 2014 -0700 |
| tree | 7854e813a1ce3f28cb46904bde14061409c554b0 | |
| parent | 18fa8e500b148dcd3620c1cde5e207813f8768a7 [diff] | |
| parent | f766ea7759b2be43253a4c0c5a924af607b012de [diff] |
resolved conflicts for merge of f766ea77 to klp-modular-dev-plus-aosp Change-Id: I2ff4b7814f33ea431cd68180660ca3e2fa1bb76c