tree 7ba08233afeb658bdd59e1e0b12e96638ee796a4
parent 9fbe94294ce2053d102ff5de89846a0c5015fb58
parent 8962f35049f77011ed69f168075649a66847a0c1
author The Android Open Source Project <initial-contribution@android.com> 1343685848 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1343685848 -0700

Reconcile with jb-mr1-release

Change-Id: Ic0cdae375d796efb3dc07956e03fea062557b765