tree e98c3eed9f9aee27bd1c93319455686fb5d29d77
parent 0c0e9b815332eca3b3626cc9c47759bbf5e48624
parent e8bb5c3a54c1bcf798689ad664233e34af059f4c
author Narayan Kamath <narayan@google.com> 1393848881 +0000
committer Narayan Kamath <narayan@google.com> 1393848881 +0000

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

Change-Id: I5cb6aeb5dd250aeba059feb1c70c13ac4745db3b