| commit | 511e12c5f4747643c9683114038e129363a95277 | [log] [tgz] |
|---|---|---|
| author | repo sync <ihab@google.com> | Tue Mar 25 13:14:24 2014 -0700 |
| committer | repo sync <ihab@google.com> | Tue Mar 25 13:58:11 2014 -0700 |
| tree | cdb4a261d2aae8e0caab07ae8805010c96fe365c | |
| parent | fa829f0d604a123a7cd4dd5df38832e59a43e1b7 [diff] |
DO NOT MERGE. One-time patch change to resolve differences where klp-modular-dev became out of sync with klp-dev due to failures of automatic merges. We decided it is far better to submit this to fix the build rather than spending a bunch of time doing forensics on the history of automated merges into klp-modular-dev. Change-Id: I66ff89237b3308a919f711bc10425a7b9688c24b