tree bc7d5abaa8c826193ba4ec7a7293a9c7125d0273
parent 19536efbe6c71ee1f94be3334b725e249b5477b6
parent 6f3c808b4f134eba1dfb57e13853addc351ca76f
author Gil Dobjanschi <virgild@google.com> 1288208254 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1288208254 -0700

Merge "Waveform member variables must be private"