tree 6e9af77c5223805bb2a6976ca68ad1dce4b587ba
parent 2b3737224efaa7ff69404e48454d7fa11c30e89c
parent 708aa23801b0bc8349ab017c92c0deaf9d767c52
author Doug Zongker <dougz@google.com> 1395165271 -0700
committer Doug Zongker <dougz@google.com> 1395165271 -0700

resolved conflicts for merge of 708aa238 to klp-dev-plus-aosp

Change-Id: Ib1d15be84cec58e23472ef2014d322f3f55c6bb8