tree 077354a2b285cb0ffad255d3f08a2ff69c013594
parent a1e1799a082283f960dafa376ae83880b3b5bf2e
parent 76a5077f78c062c53bbfa83e6d6e94c1e0e88489
author The Android Open Source Project <initial-contribution@android.com> 1349450322 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349450322 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I6ad917dd332cd6677d124b08197e1686e66e0fca