Merge pull request #25 from stevotdo/jellybean

camcorder preview size
proximity fix and others

Change-Id: I8fedd6b39668d37352991526eec4c1189c8546d4
charge fix

Change-Id: I5bd4d82394a1c785524a216f556bd4651b8e92f1
new file

Change-Id: Ia17082f3a58031762c0beee8db22747339c6fa47
Merge pull request #1 from jied83/jellybean

Jellybean