| commit | 30caffc025aff450ebb354ee693174cc1732732b | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Aug 23 14:39:39 2013 -0700 |
| committer | Colin Cross <ccross@android.com> | Fri Aug 23 14:39:39 2013 -0700 |
| tree | e08f6673d0d6b722d95735d2bf20367fdc977e1c | |
| parent | 8ca2bf084209cf121f1d4b011ad4db3e35f35c82 [diff] | |
| parent | a1af5cf6d1c008dbde2e40121940d65faa0816bf [diff] |
resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp Change-Id: I08e9898940f7cdd466469b76760807cc5d5c67e4