commit | 90cfa0011243b5461644f4182a0d76d63e41610d | [log] [tgz] |
---|---|---|
author | repo sync <dmitrygr@google.com> | Wed May 07 16:34:51 2014 -0700 |
committer | repo sync <dmitrygr@google.com> | Wed May 07 16:34:51 2014 -0700 |
tree | 3c8c187aabcd89e638f85d1772c520ee6a9ad10d | |
parent | 03498d349ae3aa5e429e999b97036d194981373f [diff] | |
parent | 5ae1c4f7088cd562c413f16f8e9d3c0a6a7287db [diff] |
resolved conflicts for merge of 5ae1c4f7 to klp-modular-dev-plus-aosp Change-Id: I4e1448af91c158e4b5a25577b9b392773d7d3bfc