tree 0170831ebee5c0b5fba1f6ddfce0d0cd8f1d5a13
parent dff4ec87e7b942b7b4410f639fc74c2cffb386d6
parent 2e55547acca4d5399cd1ff843ae6ec99c79d6782
author The Android Open Source Project <initial-contribution@android.com> 1373415193 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1373415194 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Id09bc212bd1e6901188ca5019663d19c6d9f049a