tree 0bfc41a6bb35b61da273a5f8fc74d4f2e183f746
parent 612b1be67e8b13f2ab66f86f6d279133411d237a
parent 6a55c15fd683b6ccf55ad3cca4131e531554c164
author The Android Open Source Project <initial-contribution@android.com> 1368708236 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1368708236 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Iec327c611f56804aeddd1a4310e967b9fd6c7467