tree f48c6bdbd2aa5e4e222ed11ad8c8ba54b93d494b
parent 049808e3263bb347e6a1eced99b348f98174c636
parent 1852237a1bb4483e16d8991e1b6118cacb5afcbe
author Narayan Kamath <narayan@google.com> 1397034221 +0100
committer Narayan Kamath <narayan@google.com> 1397034221 +0100

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

Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96