tree 2dda152c800117f1f6c7e789c7fb88bd5640f89b
parent 4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49
parent d90da13076303a5377de631623e16c34ee195830
author Doug Zongker <dougz@google.com> 1395097862 -0700
committer Doug Zongker <dougz@google.com> 1395097862 -0700

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

Change-Id: Ib95b5bcd8d24014e1f2a956d2f31c99a471d3e30