| commit | 8fe9c76d9acbf5a95e8e1d8a151658a8c9bac9f4 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu May 29 14:01:24 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Thu May 29 14:01:24 2014 -0700 |
| tree | c28e81f015caaaf71f0e587dec2709bb8a081a66 | |
| parent | 834ec0ead591cf64a5f660af0210e95728e08c4f [diff] | |
| parent | 2267c22b3db95fe0a0d94865c9c69cc51b1a5f70 [diff] |
resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aosp Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c