tree cf1f47dc608c875a4bfe2aee97727d4c279e4f7b
parent 38b8cae3876ce1c02d6da310ad93fb31d9c5a9ed
parent cf1466f693b0f3880c6853121e323137e46595cc
author The Android Open Source Project <initial-contribution@android.com> 1369434514 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369434514 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I03fc6d2dac608cdc0e0c83a87cc90b821f4be52c