tree aee8594b43800f6d56f8b5f78062fced5af5b5a7
parent b283d31616f451336f46e327f3a5efa419c18ac6
parent 240e26d851174c3b5b623ae12782cd781a7f8593
author The Android Open Source Project <initial-contribution@android.com> 1349194654 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349194654 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I1a142d90b8fab7b6a1fcfaef81d7d32900226d20