tree ecae3b1abaa57c09220319de58927782557558f3
parent b503d2a933024ceeacc7114c1a8db8d3897012a5
parent 9e04eb2e30bc8d5707c57c2787111b3a5b365fa9
author The Android Open Source Project <initial-contribution@android.com> 1345044549 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345044550 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Iba7a7f1424d9b513d8553b085e8eca52023984a2