tree 9e2f080fe737db6b1951ce96b541461739ad0d53
parent c5b582cebe167264106df5fa7b2ae7312cd456ce
parent 85a3499c84b64f74f13ad61953b4d509ea9380e4
author The Android Open Source Project <initial-contribution@android.com> 1339431772 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1339431772 -0700

Reconcile with jb-release

Change-Id: I498fdba3aa0836ff4f4f42e43e0e7a5d94dfa25d