tree 4fcb9c88d56d076a7f7dc66d6ff3118607a247ba
parent 20f6c310c70594e077310415b2756c9e1f42d6b5
parent 3f7da79c4ec0cd438be3409cd765fd7fd146fa9b
author The Android Open Source Project <initial-contribution@android.com> 1370303013 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1370303013 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I1168e923d0907bf1888bc2f894f7addfb559ca61