| commit | bbfebfad0d8ad002995bb1005b61a35b42a8ce35 | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Tue Feb 04 15:16:15 2014 -0800 |
| committer | Justin Koh <justinkoh@google.com> | Tue Feb 04 15:16:15 2014 -0800 |
| tree | 58a1adf3f4825db9b955e738cfeb68469c035b3c | |
| parent | 47f9b9bc290dae448f07101c1fb6629285973514 [diff] | |
| parent | 303d275591a4a73ac0a6ca49f4396f6a0d994095 [diff] |
resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9