tree 1a57a0a0e0f957a81cf71512d23dbe70ba06ca94
parent 0fcba89e5460ed3edca75322175b8a56a6e6f48d
parent 3d7c500234d98464d37ba3e1b65cea763b316b69
author Colin Cross <ccross@android.com> 1395448601 -0700
committer Colin Cross <ccross@android.com> 1395448601 -0700

resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aosp

Change-Id: I19e1a26bd0226119c4fe2920bf6a09aaeff315d9