tree 71b01bdd7c260fb401054a68c0f9776d28a2a6d2
parent 3fe4051430be1da4c1f119c165a4bb8b3a9dd499
parent b638126ed3c704ac65024597af952fd45e165410
author Narayan Kamath <narayan@google.com> 1441918826 +0100
committer Narayan Kamath <narayan@google.com> 1441918826 +0100

resolved conflicts for b638126e to klp-modular-dev

Change-Id: If5062b01afa95279ab25fe86aaafa89d4d74eaa1