tree b65271ef511e8ca66e8f9ade8fda9a03017261fc
parent af1d7d18ee25aa561a54b2c9dd34922a89ec50a3
parent ccfe9391b9fc132030314517c298fb66b8679eea
author Erik Gilling <konkers@android.com> 1301943539 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1301943539 -0700

Merge "implement capacitive sensor on demoshield" into gingerbread