| commit | d55688db3b76782c4600609067cfc61a8f1465fe | [log] [tgz] |
|---|---|---|
| author | Stuart Scott <stuartscott@google.com> | Fri Feb 21 16:23:05 2014 -0800 |
| committer | Stuart Scott <stuartscott@google.com> | Fri Feb 21 16:23:05 2014 -0800 |
| tree | e439844cddd7b99130c54e07d498f99946702ef0 | |
| parent | 40f8a0eed9c4d42b3a17b310890097b320174e8a [diff] | |
| parent | 23e6dca6795ab4a1411bee280ba63a441317c97a [diff] |
resolved conflicts for merge of 23e6dca6 to klp-modular-dev-plus-aosp Change-Id: If4e18c3443ef94b04af9fc6d193eda629052035b