tree c59140890b7157f571306c2169ad53c2e62a9932
parent 0b7197a612459caf2cdac8b9f0c0b8c5365b7837
parent 7cd7bd65fd2e81b8c05787fd7f0b8c91b6033239
author Colin Cross <ccross@android.com> 1392239190 -0800
committer Colin Cross <ccross@android.com> 1392239369 -0800

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

Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a