| commit | 3bbef521d4b07f86010ba0729a36ff8b73bcb0ac | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed May 07 13:19:28 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Wed May 07 13:20:23 2014 -0700 |
| tree | ababc0f3b85480a1ceabdacd8664098ad1398639 | |
| parent | 424edf064fb705b07f5f7d41e875dd2b24ccf271 [diff] | |
| parent | f2db00fdcd4e3dd97afd071f3af058d307a152f9 [diff] |
resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0