tree a0f5279f3cb8c4356f59da24a0d97f5cd33b321c
parent 6b096f363c8f40bdf5108a2dc27e7f4e9a5ee9e1
parent 277ba466eb30755d2b158ebed650fd50b5701bee
author Narayan Kamath <narayan@google.com> 1393508077 +0000
committer Narayan Kamath <narayan@google.com> 1393508077 +0000

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

Change-Id: Idc42f72a94c205cfe94feb220651a483cf418e84