From: Vinod Krishnan <vinodkrishnan@google.com>
Date: Thu, 4 Sep 2014 23:23:46 +0000 (+0000)
Subject: am 6de9f394: (-s ours) am 8c967b9b: DO NOT MERGE: Removing android prefix for ECG... 
X-Git-Tag: android-x86-6.0-r1~270^2~107
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a36d4e2d92d5d829b913de39f60145ebc6e6df2e;p=android-x86%2Fframeworks-native.git

am 6de9f394: (-s ours) am 8c967b9b: DO NOT MERGE: Removing android prefix for ECG feature

* commit '6de9f39476c6bbb1d196dbc6af23a27b177c7bf9':
  DO NOT MERGE: Removing android prefix for ECG feature
---

a36d4e2d92d5d829b913de39f60145ebc6e6df2e