| commit | ac9889acb84dd98e2b04bce7704d55a970447ba2 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Tue Mar 18 14:54:03 2014 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Tue Mar 18 14:54:03 2014 -0700 |
| tree | a12bf5802c34d51edc27d199a1ed3e9e4c23711d | |
| parent | fb6435a04888b2f11bba7860f467eb6992ff4c3a [diff] | |
| parent | c0f96d03a1855fda7d94332331b94860404874dd [diff] |
resolved conflicts for merge of c0f96d03 to klp-dev-plus-aosp Change-Id: I828fce2f35fb4a79d9b9afff59f8ab72413075e4