tree 1970b4100048257cdfd0cf0c07fdcebe8fed1a54
parent a31f3b23e7295e81c39aecfa02e9b2549dd64be3
parent 94974fbaeab3b724f1be87dee3e157889522a531
author The Android Open Source Project <initial-contribution@android.com> 1346943311 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1346943311 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I7cf4e6ee7be79954ccb3f4927d940c14fe7450f0