| commit | a7d211c6ad6a3d12120993ad96f9159016843d30 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Tue Mar 18 10:54:31 2014 -0700 |
| committer | Doug Zongker <dougz@google.com> | Tue Mar 18 10:54:31 2014 -0700 |
| tree | 6e9af77c5223805bb2a6976ca68ad1dce4b587ba | |
| parent | 2b3737224efaa7ff69404e48454d7fa11c30e89c [diff] | |
| parent | 708aa23801b0bc8349ab017c92c0deaf9d767c52 [diff] |
resolved conflicts for merge of 708aa238 to klp-dev-plus-aosp Change-Id: Ib1d15be84cec58e23472ef2014d322f3f55c6bb8