| commit | 4face7bf943d93ee91ca94f05df2034550f318fd | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Oct 03 11:54:41 2013 -0700 |
| committer | Stephen Hines <srhines@google.com> | Thu Oct 03 11:56:54 2013 -0700 |
| tree | b05a84218402f55c9a9c3539e59a289fc4f6134a | |
| parent | 7aaeb441b0e13ec63b48d856b752797be7a07ffa [diff] | |
| parent | 8d972a6f7975f3b43a1551eb5619f008561a5029 [diff] |
resolved conflicts for merge of 8d972a6f to klp-dev-plus-aosp Change-Id: I7d1f460a1b6de08b11b430f90c7bf2534e5cca31