tree e6cd83b48a86a6d28ddec1e38d2b022c73132737
parent 0a17412796f2a3da62aef6660fd6706c003e4ab4
parent f78598f754e97840011c32e39152d4f744632c8c
author Xavier Ducrohet <xav@google.com> 1403311874 -0700
committer Xavier Ducrohet <xav@google.com> 1403311874 -0700

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

Change-Id: I8657c95b169320957629b492fef11994227b3c56