tree f5244fa4697220caf700d28ca9c60e95f3dab9a6
parent 675515e18d1c7c814d8915a3d2565df102789803
parent ac72bff9a1fdb69260e53b277547bf4e32e8e43f
author andrew.boren <andrew.boren@gmail.com> 1352871415 -0700
committer andrew.boren <andrew.boren@gmail.com> 1352871415 -0700

Merge remote-tracking branch 'aosp/jb-mr1-release' into HEAD

Conflicts:
	src/com/android/stk/ToneDialog.java

Change-Id: I136f892b6ff70693492b4239efac3679f8bc67c5