tree f103aef739b9715fd1546b060e132a39a071a4af
parent 52d0b765ab58e7def9783623092f1891a4d7f427
parent d90da13076303a5377de631623e16c34ee195830
author Doug Zongker <dougz@google.com> 1395097988 -0700
committer Doug Zongker <dougz@google.com> 1395097988 -0700

resolved conflicts for merge of d90da130 to klp-dev-plus-aosp

Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0