tree db4323289d5f1b2adb22ed0216aad9013abcd555
parent 0f6a860f9fcba915cbf1801ddf97fdddd8785c2f
author Keun young Park <keunyoung@google.com> 1340226846 -0700
committer Keun young Park <keunyoung@google.com> 1340226846 -0700

merge from ICS

- clean up unused views
- remove too high bit-rate clips
- skip tests if there is no camera

Change-Id: Iba91656d8d375a74286982735218943482a91acb