tree 9de6bcb5843b749525b95472624ba15240c2ac0c
parent 081bc5c47d8a980e6eafa70ddafcd89981586391
parent 57e7f83c0336db3f03666f077bce4c2692a88cf6
author James Dong <jdong@google.com> 1277484194 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277484194 -0700

Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread