| commit | 47d7306767d07b64868c89535cb7db6adac128d8 | [log] [tgz] |
|---|---|---|
| author | repo sync <ihab@google.com> | Tue Mar 25 21:09:42 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 25 21:09:42 2014 +0000 |
| tree | f910a2340af15e543a842055df69fe6cb82cd443 | |
| parent | 62d83f1777bdd073b0184853aed415470294f5eb [diff] | |
| parent | 511e12c5f4747643c9683114038e129363a95277 [diff] |
Merge "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." into klp-modular-dev