tree b434273c2c13c59465c67b6575c58cd6fba43b8f
parent 4db6aef993e36fb0f6af83e587380c1179a355cb
parent 550d5f939e5f22f207cf23230d73ff09ecd32b9c
author The Android Open Source Project <initial-contribution@android.com> 1365453378 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365453378 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ic31e144dc752e8c259b9589e9f0804b2bf8d05b2