tree 7c43bb34abbacf26850f4a1b8f7545d3164a360d
parent b4cce1845336fe11dfd41b0eda14892e26799abf
parent 0d65afa1c32f22f328f18c653147d5af89b1e0da
author The Android Open Source Project <initial-contribution@android.com> 1348162640 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348162640 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I2113e75ca4c91539da0c7bb6ed80d56b4ba91af7