tree befbd35746223bac3b9ffc4429fb936f97966f57
parent 10a03d2f0fcfae2ed7a9e0d8af857f2b69948785
parent c9e32d218d9f74b44ea390c0b4f4b0188d6a093d
author The Android Open Source Project <initial-contribution@android.com> 1338309569 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1338309569 -0700

Reconcile with jb-release

Change-Id: Ib5a40ba42a95be1f39b6135ce5888741234ce15c